aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorclaudiob <claudiob@users.noreply.github.com>2018-02-11 11:29:58 -0800
committerclaudiob <claudiob@users.noreply.github.com>2018-02-11 11:37:21 -0800
commit24284fd3d4c4f857e54181c58feea81f819d6c0c (patch)
tree652d5c9dca6265710ce4f141ff41652a8eca3ff9 /railties/lib
parenta2a752d1026346e3a348682551dfc952f7cf3a58 (diff)
downloadrails-24284fd3d4c4f857e54181c58feea81f819d6c0c.tar.gz
rails-24284fd3d4c4f857e54181c58feea81f819d6c0c.tar.bz2
rails-24284fd3d4c4f857e54181c58feea81f819d6c0c.zip
Respect --force option for config/master.key
This is similar to #30700 which ensures the `--quiet` option of `rails new` is respected by the `MasterKeyGenerator` (missing from #30067). Before this commit, running `rails new app --force` would still prompt the user what to do with the conflict in `config/master.key`: ``` … identical config/locales/en.yml conflict config/master.key Overwrite /Users/claudiob/Desktop/pizza/config/master.key? (enter "h" for help) [Ynaqdh] ``` After this commit, `config/master.key` is overwritten: ``` … identical config/locales/en.yml force config/master.key append .gitignore ``` The newly added test generates an app and then generates it again with `--force`. Without this commit, the test would just wait forever for user input.
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index fd9da7803f..3eb7f6b845 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -167,7 +167,7 @@ module Rails
return if options[:pretend] || options[:dummy_app]
require "rails/generators/rails/master_key/master_key_generator"
- master_key_generator = Rails::Generators::MasterKeyGenerator.new([], quiet: options[:quiet])
+ master_key_generator = Rails::Generators::MasterKeyGenerator.new([], quiet: options[:quiet], force: options[:force])
master_key_generator.add_master_key_file_silently
master_key_generator.ignore_master_key_file_silently
end