diff options
| author | Yuji Yaginuma <yuuji.yaginuma@gmail.com> | 2018-02-13 21:18:39 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 21:18:39 +0900 |
| commit | 8157c8a742ca83b917b9bdffe21aa4a4d6f398dc (patch) | |
| tree | c28ed970784d85a436292740154a13cc6c13a0f6 /railties/lib/rails/generators | |
| parent | b9ed1fa4442633e1328dcde5a37a472b22003a6f (diff) | |
| parent | b77861d0c9f9ff941e70b38a920a6084627c0713 (diff) | |
| download | rails-8157c8a742ca83b917b9bdffe21aa4a4d6f398dc.tar.gz rails-8157c8a742ca83b917b9bdffe21aa4a4d6f398dc.tar.bz2 rails-8157c8a742ca83b917b9bdffe21aa4a4d6f398dc.zip | |
Merge pull request #31978 from claudiob/don-t-overwrite-master-key
Don't overwrite config/master.key even on --force
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/master_key/master_key_generator.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/master_key/master_key_generator.rb b/railties/lib/rails/generators/rails/master_key/master_key_generator.rb index 82968985dc..21664ea86d 100644 --- a/railties/lib/rails/generators/rails/master_key/master_key_generator.rb +++ b/railties/lib/rails/generators/rails/master_key/master_key_generator.rb @@ -27,7 +27,9 @@ module Rails end def add_master_key_file_silently(key = nil) - key_file_generator.add_key_file_silently(MASTER_KEY_PATH, key) + unless MASTER_KEY_PATH.exist? + key_file_generator.add_key_file_silently(MASTER_KEY_PATH, key) + end end def ignore_master_key_file |