diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2014-08-08 18:20:17 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2014-08-08 18:20:33 -0300 |
| commit | d70ba48c4dd6b57d8f38612ea95a3842337c1419 (patch) | |
| tree | 7dd4e40be314eab0e55072714c3454a88110b7ca /railties/lib/rails | |
| parent | 705977620539e2be6548027042f33175ebdc2505 (diff) | |
| download | rails-d70ba48c4dd6b57d8f38612ea95a3842337c1419.tar.gz rails-d70ba48c4dd6b57d8f38612ea95a3842337c1419.tar.bz2 rails-d70ba48c4dd6b57d8f38612ea95a3842337c1419.zip | |
Revert "Merge pull request #16434 from strzalek/cookies-digest-config-option"
This reverts commit 705977620539e2be6548027042f33175ebdc2505, reversing
changes made to dde91e9bf5ab246f0f684b40288b272f4ba9a699.
IT BROKE THE BUILD!!!
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 16bea413b5..61639be7c6 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -200,7 +200,7 @@ module Rails def message_verifier(verifier_name) @message_verifiers[verifier_name] ||= begin secret = key_generator.generate_key(verifier_name.to_s) - ActiveSupport::MessageVerifier.new(secret, digest: config.action_dispatch.cookies_digest, serializer: config.action_dispatch.cookies_serializer) + ActiveSupport::MessageVerifier.new(secret) end end @@ -257,7 +257,6 @@ module Rails "action_dispatch.encrypted_cookie_salt" => config.action_dispatch.encrypted_cookie_salt, "action_dispatch.encrypted_signed_cookie_salt" => config.action_dispatch.encrypted_signed_cookie_salt, "action_dispatch.cookies_serializer" => config.action_dispatch.cookies_serializer - "action_dispatch.cookies_digest" => config.action_dispatch.cookies_digest }) end end |