aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-09-12 17:40:33 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-09-12 17:40:33 +0900
commit08669767a6878a49690c8964f6fc5acf1250b515 (patch)
treed7bf7f3c86209c7126409254b96ec45df9f09efe /railties
parent69f976b859cae7f9d050152103da018b7f5dda6d (diff)
downloadrails-08669767a6878a49690c8964f6fc5acf1250b515.tar.gz
rails-08669767a6878a49690c8964f6fc5acf1250b515.tar.bz2
rails-08669767a6878a49690c8964f6fc5acf1250b515.zip
Do not add master key and credentials when `pretend` option is specified
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index c67baa5e91..ac82ff6633 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -159,6 +159,8 @@ module Rails
end
def master_key
+ return if options[:pretend]
+
require_relative "../master_key/master_key_generator"
after_bundle do
@@ -167,6 +169,8 @@ module Rails
end
def credentials
+ return if options[:pretend]
+
require_relative "../credentials/credentials_generator"
after_bundle do