diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-09-14 20:16:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-14 20:16:38 +0200 |
| commit | 9fa883143ade7230877156cf1bf90579a6f91c6a (patch) | |
| tree | a58d3bbefb614d5f8b9221dceaa8149eb4f2d0da /railties/lib | |
| parent | 43fbfb483ff72c69f6630fd110f44ae7802bdabc (diff) | |
| parent | 08669767a6878a49690c8964f6fc5acf1250b515 (diff) | |
| download | rails-9fa883143ade7230877156cf1bf90579a6f91c6a.tar.gz rails-9fa883143ade7230877156cf1bf90579a6f91c6a.tar.bz2 rails-9fa883143ade7230877156cf1bf90579a6f91c6a.zip | |
Merge pull request #30582 from y-yagi/do_no_add_master_key_and_credentials
Do not add master key and credentials when `pretend` option is specified
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 4 |
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 |