summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-12 02:50:50 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-12 02:50:50 +0000
commitaf4907c54f5f356d94c9c0ba53539487f8118659 (patch)
treebc2b3abddbe1a196744326452008bf35a6f2adae /ChangeLog
parent26df8ea5bb613bcef93c4db0a8772099b5217d37 (diff)
merge revision(s) 55609: [Backport #12568]
* vm_args.c (setup_parameters_complex): don't raise ArgumentError if an array is given for instance_exec with optional argument. [ruby-core:76300] [Bug #12568] https://github.com/rails/rails/pull/25699 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55875 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a297465c3a..755fa86fe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Aug 12 11:48:27 2016 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * vm_args.c (setup_parameters_complex): don't raise ArgumentError
+ if an array is given for instance_exec with optional argument.
+ [ruby-core:76300] [Bug #12568]
+ https://github.com/rails/rails/pull/25699
+
Fri Aug 12 11:45:02 2016 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/http/generic_rquest.rb (write_header): A Request-Line must