aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-01-13 12:33:04 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-01-13 12:33:04 -0800
commit8b70319c270415e9f99ed8eb1f12dd1caaade1fd (patch)
tree8c9ed3620235437aa4fd2cc23e9d0a9f9774a9d7 /railties/lib
parentfe24a383d100afcd6c8a1f8a121ddd9fe53a2e9a (diff)
parentb9095ec95c38e17425eef26018aeb962e96c323f (diff)
downloadrails-8b70319c270415e9f99ed8eb1f12dd1caaade1fd.tar.gz
rails-8b70319c270415e9f99ed8eb1f12dd1caaade1fd.tar.bz2
rails-8b70319c270415e9f99ed8eb1f12dd1caaade1fd.zip
Merge pull request #13703 from schneems/schneems/rail-secrets-key
Favor canonical environment variables for secrets
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/secrets.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/secrets.yml b/railties/lib/rails/generators/rails/app/templates/config/secrets.yml
index 6e2c45e119..b2669a0f79 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/secrets.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/secrets.yml
@@ -19,4 +19,4 @@ test:
# Do not keep production secrets in the repository,
# instead read values from the environment.
production:
- secret_key_base: <%%= ENV["RAILS_SECRET_KEY_BASE"] %>
+ secret_key_base: <%%= ENV["SECRET_KEY_BASE"] %>