diff options
author | Yehuda Katz <wycats@gmail.com> | 2009-10-26 15:47:08 -0700 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-10-26 15:47:08 -0700 |
commit | 60cc86136bffc96bc62798538e08e0d28138d41c (patch) | |
tree | 9d5381f01c8ece005c05ea52061781aa49472660 /actionpack/lib/action_controller/metal/session_management.rb | |
parent | 55ae53baadf37daf2c966bf5d9d67c1f954cb681 (diff) | |
download | rails-60cc86136bffc96bc62798538e08e0d28138d41c.tar.gz rails-60cc86136bffc96bc62798538e08e0d28138d41c.tar.bz2 rails-60cc86136bffc96bc62798538e08e0d28138d41c.zip |
Base setup for config object in AC.
Diffstat (limited to 'actionpack/lib/action_controller/metal/session_management.rb')
-rw-r--r-- | actionpack/lib/action_controller/metal/session_management.rb | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/actionpack/lib/action_controller/metal/session_management.rb b/actionpack/lib/action_controller/metal/session_management.rb index 654aa08cd3..9f4c4b8b39 100644 --- a/actionpack/lib/action_controller/metal/session_management.rb +++ b/actionpack/lib/action_controller/metal/session_management.rb @@ -1,10 +1,8 @@ module ActionController #:nodoc: module SessionManagement #:nodoc: - def self.included(base) - base.class_eval do - extend ClassMethods - end - end + include ActiveSupport::Concern + + include ActionController::Configuration module ClassMethods # Set the session store to be used for keeping the session data between requests. @@ -35,13 +33,6 @@ module ActionController #:nodoc: session_options.merge!(options) end - # Returns the hash used to configure the session. Example use: - # - # ActionController::Base.session_options[:secure] = true # session only available over HTTPS - def session_options - @session_options ||= {} - end - def session(*args) ActiveSupport::Deprecation.warn( "Disabling sessions for a single controller has been deprecated. " + |