summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-11 14:55:58 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-11 14:55:58 +0000
commit5712fa573d0e8dd85b21c3bb668048f1985ccf89 (patch)
tree6fa22ad97d66bae0484c19864ea817bee1b24585 /ChangeLog
parent5a5ac31458c5fed5502e4a3dd7b05868ff9379fb (diff)
merge revision(s) r46241: [Backport #9875]
* lib/erb.rb (result): [DOC] no longer accepts a Proc, as Kernel.eval does not. [fix GH-619] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d6b1b9de42..3814bd9481 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 11 23:55:32 2014 Mark Lorenz <mlorenz@covermymeds.com>
+
+ * lib/erb.rb (result): [DOC] no longer accepts a Proc, as
+ Kernel.eval does not. [fix GH-619]
+
Mon Aug 11 23:38:20 2014 Tanaka Akira <akr@fsij.org>
* io.c (rb_io_autoclose_p): Don't raise on frozen IO.