diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-03-24 22:57:23 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-03-24 22:57:23 -0700 |
| commit | 15d8e7986683613c88a52bd2c704f1ac17738217 (patch) | |
| tree | 0965cd85ad87bd65a772872a1e87ade26d957c26 /railties | |
| parent | 825b91b9e708029927fa7df8c37688b17adddb4b (diff) | |
| parent | 0190cba99c9d3367cfba9b2d1901633715fa314c (diff) | |
| download | rails-15d8e7986683613c88a52bd2c704f1ac17738217.tar.gz rails-15d8e7986683613c88a52bd2c704f1ac17738217.tar.bz2 rails-15d8e7986683613c88a52bd2c704f1ac17738217.zip | |
Merge pull request #9909 from trevorturk/9740
Transparently upgrade signed cookies when setting secret_key_base
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/application.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 0de44984d7..563905e8b3 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -149,6 +149,7 @@ module Rails "action_dispatch.parameter_filter" => config.filter_parameters, "action_dispatch.redirect_filter" => config.filter_redirect, "action_dispatch.secret_token" => config.secret_token, + "action_dispatch.secret_key_base" => config.secret_key_base, "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions, "action_dispatch.show_detailed_exceptions" => config.consider_all_requests_local, "action_dispatch.logger" => Rails.logger, |