diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-01-29 10:48:49 -0800 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-01-29 10:48:49 -0800 |
| commit | b242552430345aedd36bb0ab357089f9a0dc746f (patch) | |
| tree | 5e09d9c86629843b036fbd717a5d4f4a1d180eb3 /railties/lib | |
| parent | 40e7fe3451df8e5b454f7d0472396d2429edc0e5 (diff) | |
| parent | b23ffd0dac895aa3fd3afd8d9be36794941731b2 (diff) | |
| download | rails-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')
| -rw-r--r-- | railties/lib/rails/application.rb | 3 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt | 2 |
2 files changed, 3 insertions, 2 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 diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt index 2bb9b82c61..923d423287 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt @@ -1,3 +1,3 @@ # Be sure to restart your server when you modify this file. -Rails.application.config.session_store :cookie_store, key: <%= "'_#{app_name}_session'" %> +Rails.application.config.session_store :cookie_store, key: <%= "'_#{app_name}_session'" %>, serializer: :json_serializer |