aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-09-14 20:38:24 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2017-09-14 20:38:24 +0200
commit31a8e7c6264b76c3966ee3b0dcd14230ef390fa5 (patch)
treedf7c1019910ee2b4d50a7300548158e9f9b70752
parent9fa883143ade7230877156cf1bf90579a6f91c6a (diff)
downloadrails-31a8e7c6264b76c3966ee3b0dcd14230ef390fa5.tar.gz
rails-31a8e7c6264b76c3966ee3b0dcd14230ef390fa5.tar.bz2
rails-31a8e7c6264b76c3966ee3b0dcd14230ef390fa5.zip
Inline the lone add_master_key_file_silently use.
-rw-r--r--railties/lib/rails/generators/rails/master_key/master_key_generator.rb6
1 files changed, 1 insertions, 5 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 a79e83495a..e49d3b39e0 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
@@ -20,17 +20,13 @@ module Rails
say "If you lose the key, no one, including you, can access anything encrypted with it."
say ""
- add_master_key_file_silently key
+ create_file MASTER_KEY_PATH, key
say ""
ignore_master_key_file
end
end
- def add_master_key_file_silently(key = nil)
- create_file MASTER_KEY_PATH, key || ActiveSupport::EncryptedFile.generate_key
- end
-
private
def ignore_master_key_file
if File.exist?(".gitignore")