aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2014-08-08 18:20:17 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2014-08-08 18:20:33 -0300
commitd70ba48c4dd6b57d8f38612ea95a3842337c1419 (patch)
tree7dd4e40be314eab0e55072714c3454a88110b7ca /railties
parent705977620539e2be6548027042f33175ebdc2505 (diff)
downloadrails-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')
-rw-r--r--railties/CHANGELOG.md6
-rw-r--r--railties/lib/rails/application.rb3
2 files changed, 1 insertions, 8 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 95693f958b..1ccdfb6589 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,9 +1,3 @@
-* The `Rails.application.message_verifier` now returns ActiveSupport::MessageVerifier
- preconfigured with `:digest` and `:serializer` values set to `config.action_dispatch.cookies_digest`
- and `config.action_dispatch.cookies_serializer` accordingly.
-
- *Łukasz Strzałkowski*
-
* Add `after_bundle` callbacks in Rails templates. Useful for allowing the
generated binstubs to be added to version control.
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