diff options
| author | José Valim <jose.valim@gmail.com> | 2010-05-18 01:43:06 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-05-18 02:05:20 +0200 |
| commit | 25f7c030e4ea440ea6c2a84c92118299753392d9 (patch) | |
| tree | e2c1168b9342db55a982c2452b46ff5999e59394 /railties/lib/rails/application | |
| parent | 941b653627b9ca7b7f2ddb4a712fb0efccc10500 (diff) | |
| download | rails-25f7c030e4ea440ea6c2a84c92118299753392d9.tar.gz rails-25f7c030e4ea440ea6c2a84c92118299753392d9.tar.bz2 rails-25f7c030e4ea440ea6c2a84c92118299753392d9.zip | |
Simplify cookie_store by simply relying on cookies.signed.
Diffstat (limited to 'railties/lib/rails/application')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 8afe423973..1b8af370f7 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -11,7 +11,8 @@ module Rails :encoding, :consider_all_requests_local, :dependency_loading, :filter_parameters, :log_level, :logger, :metals, :plugins, :preload_frameworks, :reload_engines, :reload_plugins, - :secret_token, :serve_static_assets, :time_zone, :whiny_nils + :secret_token, :serve_static_assets, :session_options, + :time_zone, :whiny_nils def initialize(*) super @@ -138,11 +139,6 @@ module Rails end end - def session_options - return @session_options unless @session_store == :cookie_store - @session_options.merge(:secret => @secret_token) - end - protected def default_middleware_stack |