aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-12-30 15:43:40 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2012-12-30 15:43:40 -0200
commit219e831d15b10eef43a7a65262bd0938e6baaabb (patch)
tree117809089208544d349f66c9f9cd2e720915e690 /railties/lib
parent257b3f63c4c73e369d789c7b10653398df7390f7 (diff)
downloadrails-219e831d15b10eef43a7a65262bd0938e6baaabb.tar.gz
rails-219e831d15b10eef43a7a65262bd0938e6baaabb.tar.bz2
rails-219e831d15b10eef43a7a65262bd0938e6baaabb.zip
Improve secret_token deprecation message
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/application.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 8439d4864d..cff75872b2 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -135,9 +135,10 @@ module Rails
def env_config
@env_config ||= begin
if config.secret_key_base.nil?
- ActiveSupport::Deprecation.warn "You didn't set config.secret_key_base. " +
- "This should be used instead of the old deprecated config.secret_token. " +
- "Set config.secret_key_base instead of config.secret_token in config/initializers/secret_token.rb"
+ ActiveSupport::Deprecation.warn "You didn't set config.secret_key_base in config/initializers/secret_token.rb file. " +
+ "This should be used instead of the old deprecated config.secret_token in order to use the new EncryptedCookieStore. " +
+ "To convert safely to the encrypted store (without losing existing cookies and sessions), see http://guides.rubyonrails.org/upgrading_ruby_on_rails.html#action-pack"
+
if config.secret_token.blank?
raise "You must set config.secret_key_base in your app's config"
end