aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2014-01-29 10:48:49 -0800
committerGuillermo Iguaran <guilleiguaran@gmail.com>2014-01-29 10:48:49 -0800
commitb242552430345aedd36bb0ab357089f9a0dc746f (patch)
tree5e09d9c86629843b036fbd717a5d4f4a1d180eb3 /railties/lib/rails/application.rb
parent40e7fe3451df8e5b454f7d0472396d2429edc0e5 (diff)
parentb23ffd0dac895aa3fd3afd8d9be36794941731b2 (diff)
downloadrails-b242552430345aedd36bb0ab357089f9a0dc746f.tar.gz
rails-b242552430345aedd36bb0ab357089f9a0dc746f.tar.bz2
rails-b242552430345aedd36bb0ab357089f9a0dc746f.zip
Merge pull request #13692 from lukesarnacki/change-default-session-serializer
Allow session serializer key in config.session_store
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 05acd78d98..36432e56ba 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -205,7 +205,8 @@ module Rails
"action_dispatch.http_auth_salt" => config.action_dispatch.http_auth_salt,
"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.encrypted_signed_cookie_salt" => config.action_dispatch.encrypted_signed_cookie_salt,
+ "action_dispatch.session_serializer" => config.session_options[:serializer]
})
end
end