diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-08-17 11:23:14 -0700 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-08-17 11:23:14 -0700 |
| commit | beff925c32c70981959aaa37531bcf4cd9c8ba28 (patch) | |
| tree | 03251d8f33c0b575ce6bbcb21d8b97492c97a464 /railties/lib/rails | |
| parent | 14965baa09771a80babc15dba42c864806f575f5 (diff) | |
| parent | 29be3f5d8386fc9a8a67844fa9b7d6860574e715 (diff) | |
| download | rails-beff925c32c70981959aaa37531bcf4cd9c8ba28.tar.gz rails-beff925c32c70981959aaa37531bcf4cd9c8ba28.tar.bz2 rails-beff925c32c70981959aaa37531bcf4cd9c8ba28.zip | |
Merge pull request #16467 from strzalek/cookies-digest-config-option2
Cookies digest config option (pt. 2)
Conflicts:
actionpack/CHANGELOG.md
actionpack/lib/action_dispatch/middleware/cookies.rb
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 61639be7c6..6a4660bad0 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -256,7 +256,8 @@ module Rails "action_dispatch.signed_cookie_salt" => config.action_dispatch.signed_cookie_salt, "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_serializer" => config.action_dispatch.cookies_serializer, + "action_dispatch.cookies_digest" => config.action_dispatch.cookies_digest }) end end |