kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) r46241: [Backport #9875]

Browse source 
* 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
This commit is contained in:
nagachika 2014-08-11 14:55:58 +00:00
parent 5a5ac31458
commit 5712fa573d
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Mon Aug 11 23:38:20 2014 Tanaka Akira <akr@fsij.org>
* io.c (rb_io_autoclose_p): Don't raise on frozen IO. * io.c (rb_io_autoclose_p): Don't raise on frozen IO.

2
lib/erb.rb
View file

@ -837,7 +837,7 @@ class ERB
# the results of that code. (See ERB::new for details on how this process # the results of that code. (See ERB::new for details on how this process
# can be affected by _safe_level_.) # can be affected by _safe_level_.)
# #
# _b_ accepts a Binding or Proc object which is used to set the context of # _b_ accepts a Binding object which is used to set the context of
# code evaluation. # code evaluation.
# #
def result(b=new_toplevel) def result(b=new_toplevel)

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.2" #define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-08-11" #define RUBY_RELEASE_DATE "2014-08-11"
#define RUBY_PATCHLEVEL 199 #define RUBY_PATCHLEVEL 200
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 8 #define RUBY_RELEASE_MONTH 8