summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/logger.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c594539724..8e0ccd66a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 9 16:36:23 2016 Naotoshi Seo <sonots@gmail.com>
+
+ * lib/logger.rb: Remove block from Logger.add as it's not needed
+ patch provided by Daniel Lobato GarcĂ­ [fix GH-1240] [Bug #12054]
+
Tue Feb 9 14:32:23 2016 Zachary Scott <zzak@ruby-lang.org>
* ext/zlib/zlib.c: Document mtime header behavior with patch by @schneems
diff --git a/lib/logger.rb b/lib/logger.rb
index 2246673b09..5a310bacb5 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -416,7 +416,7 @@ class Logger
# * Append open does not need to lock file.
# * If the OS supports multi I/O, records possibly may be mixed.
#
- def add(severity, message = nil, progname = nil, &block)
+ def add(severity, message = nil, progname = nil)
severity ||= UNKNOWN
if @logdev.nil? or severity < @level
return true