aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-11-14 11:29:28 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-11-14 11:29:28 -0800
commit84961dc5df86c70504bdcdc218799e9f848a7a00 (patch)
tree14b7072cf0eb29cfb57cdadb2f70d51f454db7de /railties/lib
parenta23bf6f55a2bea50ec39cc744e17c924d727c089 (diff)
parentd3a1ce1cdc60d593de1682c5f4e3230c8db9a0fd (diff)
downloadrails-84961dc5df86c70504bdcdc218799e9f848a7a00.tar.gz
rails-84961dc5df86c70504bdcdc218799e9f848a7a00.tar.bz2
rails-84961dc5df86c70504bdcdc218799e9f848a7a00.zip
Merge pull request #12889 from kuldeepaggarwal/speed_ups
Used Yield instead of block.call
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/actions.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index 366c72ebaa..4757c79ac6 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -84,10 +84,10 @@ module Rails
# environment(nil, env: "development") do
# "config.autoload_paths += %W(#{config.root}/extras)"
# end
- def environment(data=nil, options={}, &block)
+ def environment(data = nil, options = {})
sentinel = /class [a-z_:]+ < Rails::Application/i
env_file_sentinel = /Rails\.application\.configure do/
- data = block.call if !data && block_given?
+ data = yield if !data && block_given?
in_root do
if options[:env].nil?