aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/secrets.rb
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-07-09 03:00:56 +0930
committerGitHub <noreply@github.com>2017-07-09 03:00:56 +0930
commit7147e52455e5cdb745557465fc17f838f0003647 (patch)
tree7d19a38bb0f75de4ff118e481ccd6b0459854a61 /railties/lib/rails/secrets.rb
parent8fdc166e564da87ec3fe66837ffa98de57fd85c8 (diff)
parent32327eb12320087aaefb382a17e1c517207e1571 (diff)
downloadrails-7147e52455e5cdb745557465fc17f838f0003647.tar.gz
rails-7147e52455e5cdb745557465fc17f838f0003647.tar.bz2
rails-7147e52455e5cdb745557465fc17f838f0003647.zip
Merge pull request #29705 from y-yagi/do_not_update_secrets_yml_enc
Do not update `secrets.yml.enc` when secretes do not change
Diffstat (limited to 'railties/lib/rails/secrets.rb')
-rw-r--r--railties/lib/rails/secrets.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/rails/secrets.rb b/railties/lib/rails/secrets.rb
index c7a8676d7b..955ab096e8 100644
--- a/railties/lib/rails/secrets.rb
+++ b/railties/lib/rails/secrets.rb
@@ -105,7 +105,9 @@ module Rails
yield tmp_path
- write(File.read(tmp_path))
+ updated_contents = File.read(tmp_path)
+
+ write(updated_contents) if updated_contents != contents
ensure
FileUtils.rm(tmp_path) if File.exist?(tmp_path)
end