diff options
| author | José Valim <jose.valim@gmail.com> | 2010-04-05 10:52:47 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-04-05 12:00:24 +0200 |
| commit | 6690d662920f0db854f7303cd2a5a36c72299199 (patch) | |
| tree | 9e531ce7d2945b5eb0ce06e63277cc06361b37c0 /actionpack/lib/action_controller/metal/cookies.rb | |
| parent | 5c8b4c6e231257bc08d32722e098927885e5e74d (diff) | |
| download | rails-6690d662920f0db854f7303cd2a5a36c72299199.tar.gz rails-6690d662920f0db854f7303cd2a5a36c72299199.tar.bz2 rails-6690d662920f0db854f7303cd2a5a36c72299199.zip | |
Rename config.cookie_secret to config.secret_token and pass it as configuration in request.env. This is another step forward removing global configuration.
Diffstat (limited to 'actionpack/lib/action_controller/metal/cookies.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/cookies.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/cookies.rb b/actionpack/lib/action_controller/metal/cookies.rb index 4aaa705203..d787f014cd 100644 --- a/actionpack/lib/action_controller/metal/cookies.rb +++ b/actionpack/lib/action_controller/metal/cookies.rb @@ -10,8 +10,7 @@ module ActionController #:nodoc: private def cookies - raise "You must set config.cookie_secret in your app's config" if config.secret.blank? - request.cookie_jar(:signing_secret => config.secret) + request.cookie_jar end end end |