diff options
| author | Zachary Scott <e@zzak.io> | 2014-10-18 13:04:02 -0700 |
|---|---|---|
| committer | Zachary Scott <e@zzak.io> | 2014-10-18 13:04:02 -0700 |
| commit | 7b71d8cfabe71dc9cf265809eed51e6956b60b7f (patch) | |
| tree | a501183c27ec86acd5155f50f0afd0ee5ceb371a /railties | |
| parent | faf3616d5eecd68ef5feff504d2d18b5c533d785 (diff) | |
| download | rails-7b71d8cfabe71dc9cf265809eed51e6956b60b7f.tar.gz rails-7b71d8cfabe71dc9cf265809eed51e6956b60b7f.tar.bz2 rails-7b71d8cfabe71dc9cf265809eed51e6956b60b7f.zip | |
Revert "Replace (slower) block.call with (faster) yield"
This reverts commit 0ab075e75f58bf403f7ebe20546c7005f35db1f6.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/actions.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/actions/create_migration.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb index ffdb314612..b2c9d12996 100644 --- a/railties/lib/rails/generators/actions.rb +++ b/railties/lib/rails/generators/actions.rb @@ -85,10 +85,10 @@ module Rails # environment(nil, env: "development") do # "config.autoload_paths += %W(#{config.root}/extras)" # end - def environment(data=nil, options={}) + def environment(data=nil, options={}, &block) sentinel = /class [a-z_:]+ < Rails::Application/i env_file_sentinel = /Rails\.application\.configure do/ - data = yield if !data && block_given? + data = block.call if !data && block_given? in_root do if options[:env].nil? diff --git a/railties/lib/rails/generators/actions/create_migration.rb b/railties/lib/rails/generators/actions/create_migration.rb index cffdef6ec9..682092fdf2 100644 --- a/railties/lib/rails/generators/actions/create_migration.rb +++ b/railties/lib/rails/generators/actions/create_migration.rb @@ -39,7 +39,7 @@ module Rails protected - def on_conflict_behavior + def on_conflict_behavior(&block) options = base.options.merge(config) if identical? say_status :identical, :blue, relative_existing_migration @@ -48,7 +48,7 @@ module Rails say_status :create, :green unless pretend? ::FileUtils.rm_rf(existing_migration) - yield + block.call end elsif options[:skip] say_status :skip, :yellow |