From 219e831d15b10eef43a7a65262bd0938e6baaabb Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sun, 30 Dec 2012 15:43:40 -0200
Subject: Improve secret_token deprecation message
---
railties/lib/rails/application.rb | 7 ++++---
1 file 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
--
cgit v1.2.3