aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-07-13 11:54:28 +0200
committerGitHub <noreply@github.com>2017-07-13 11:54:28 +0200
commit472f39f781e5ebf5dcb19bb432572ba68dfcceca (patch)
tree9f98d4872347b252b7b27a4ed64a1b79b8e88696 /railties
parenta34ee0c41f8081b6c4869fd0546f75713c09805c (diff)
parent1677c64ee0929085c72467468b7c2e87554a80ba (diff)
downloadrails-472f39f781e5ebf5dcb19bb432572ba68dfcceca.tar.gz
rails-472f39f781e5ebf5dcb19bb432572ba68dfcceca.tar.bz2
rails-472f39f781e5ebf5dcb19bb432572ba68dfcceca.zip
Merge pull request #29772 from y-yagi/allow_to_edit_secrets_in_mutiple_applications_at_the_same_time
Allow to edit secrets in mutiple apps at the same time
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/secrets.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/secrets.rb b/railties/lib/rails/secrets.rb
index 46e21185d7..0883857c55 100644
--- a/railties/lib/rails/secrets.rb
+++ b/railties/lib/rails/secrets.rb
@@ -100,7 +100,8 @@ module Rails
end
def writing(contents)
- tmp_path = File.join(Dir.tmpdir, File.basename(path))
+ tmp_file = "#{File.basename(path)}.#{Process.pid}"
+ tmp_path = File.join(Dir.tmpdir, tmp_file)
IO.binwrite(tmp_path, contents)
yield tmp_path