aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-11-16 17:17:08 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2012-11-16 17:29:26 -0200
commit8eefdb6d7056dc0d4d63a5c34a4b12701ba21c88 (patch)
tree18e732ac6913c5ee1cc211b19ce54396d569f3ef /railties/lib/rails
parentd4b9a3fa706034b1ac2a6f8a479a697d071517a9 (diff)
downloadrails-8eefdb6d7056dc0d4d63a5c34a4b12701ba21c88.tar.gz
rails-8eefdb6d7056dc0d4d63a5c34a4b12701ba21c88.tar.bz2
rails-8eefdb6d7056dc0d4d63a5c34a4b12701ba21c88.zip
Add UpgradeSignatureToEncryptionCookieStore
This allows easy upgrading from the old signed Cookie Store <= 3.2 or the deprecated one in 4.0 (the ones that doesn't use key derivation) to the new one that signs using key derivation
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/application.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index b7844bbfbe..ae3993fbd8 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -123,6 +123,7 @@ module Rails
# Currently stores:
#
# * "action_dispatch.parameter_filter" => config.filter_parameters
+ # * "action_dispatch.secret_token" => config.secret_token,
# * "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions
# * "action_dispatch.show_detailed_exceptions" => config.consider_all_requests_local
# * "action_dispatch.logger" => Rails.logger
@@ -148,6 +149,7 @@ module Rails
super.merge({
"action_dispatch.parameter_filter" => config.filter_parameters,
+ "action_dispatch.secret_token" => config.secret_token,
"action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions,
"action_dispatch.show_detailed_exceptions" => config.consider_all_requests_local,
"action_dispatch.logger" => Rails.logger,