aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorRichard Schneeman <richard.schneeman+no-recruiters@gmail.com>2018-07-25 16:00:33 -0500
committerGitHub <noreply@github.com>2018-07-25 16:00:33 -0500
commit91fd679710118482f718ea710710561f1cfb0b70 (patch)
tree9169aa6ea2315b16f77e530dd2c6a4eda1816769 /railties/lib/rails/generators
parentab8847c92092a57df6433f4fc72682074359531f (diff)
parentd108288c2f684233298f97f18ac00de0b016deaa (diff)
downloadrails-91fd679710118482f718ea710710561f1cfb0b70.tar.gz
rails-91fd679710118482f718ea710710561f1cfb0b70.tar.bz2
rails-91fd679710118482f718ea710710561f1cfb0b70.zip
Merge pull request #32381 from q-centrix/update-codeclimate-configs
Turn on performance based cops
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/actions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index d85bbfb03e..ae395708cb 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -298,7 +298,7 @@ module Rails
sudo = options[:sudo] && !Gem.win_platform? ? "sudo " : ""
config = { verbose: false }
- config.merge!(capture: options[:capture]) if options[:capture]
+ config[:capture] = options[:capture] if options[:capture]
in_root { run("#{sudo}#{extify(executor)} #{command} RAILS_ENV=#{env}", config) }
end