aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorMark Thomson <nzl216@gmail.com>2012-03-13 02:37:53 -0500
committerMark Thomson <nzl216@gmail.com>2012-03-13 02:37:53 -0500
commitbc8b55c5c382b6747e490c04d9d74dc8322bd23c (patch)
tree1a1e0b4a66cf7f4b4aacc4b898356a3b4834f288 /railties/lib/rails
parent4cb71eaf463bb6a12edd1aaf222e9f1e3269bea7 (diff)
parent30b2dd431e889ba613511763152a28bab623b90e (diff)
downloadrails-bc8b55c5c382b6747e490c04d9d74dc8322bd23c.tar.gz
rails-bc8b55c5c382b6747e490c04d9d74dc8322bd23c.tar.bz2
rails-bc8b55c5c382b6747e490c04d9d74dc8322bd23c.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt
index a3143f1346..e02397aaf9 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt
@@ -4,4 +4,6 @@
# If you change this key, all old signed cookies will become invalid!
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
+# Make sure your secret_token is kept private
+# if you're sharing your code publicly.
<%= app_const %>.config.secret_token = '<%= app_secret %>'