mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Remove a failed attempt at refactoring AC configuration
This commit is contained in:
parent
7979da2fa8
commit
29158d4158
4 changed files with 0 additions and 32 deletions
|
@ -13,7 +13,6 @@ module ActionController
|
|||
autoload_under "metal" do
|
||||
autoload :Compatibility
|
||||
autoload :ConditionalGet
|
||||
autoload :Configuration
|
||||
autoload :Cookies
|
||||
autoload :Flash
|
||||
autoload :Head
|
||||
|
|
|
@ -15,7 +15,6 @@ module ActionController
|
|||
include ActionController::Renderers::All
|
||||
include ActionController::ConditionalGet
|
||||
include ActionController::RackDelegation
|
||||
include ActionController::Configuration
|
||||
|
||||
# Legacy modules
|
||||
include SessionManagement
|
||||
|
|
|
@ -1,28 +0,0 @@
|
|||
module ActionController
|
||||
module Configuration
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
def config
|
||||
@config ||= self.class.config
|
||||
end
|
||||
|
||||
def config=(config)
|
||||
@config = config
|
||||
end
|
||||
|
||||
module ClassMethods
|
||||
def default_config
|
||||
@default_config ||= {}
|
||||
end
|
||||
|
||||
def config
|
||||
self.config ||= default_config
|
||||
end
|
||||
|
||||
def config=(config)
|
||||
@config = ActiveSupport::OrderedHash.new
|
||||
@config.merge!(config)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
|
@ -2,8 +2,6 @@ module ActionController #:nodoc:
|
|||
module SessionManagement #:nodoc:
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
include ActionController::Configuration
|
||||
|
||||
module ClassMethods
|
||||
# Set the session store to be used for keeping the session data between requests.
|
||||
# By default, sessions are stored in browser cookies (<tt>:cookie_store</tt>),
|
||||
|
|
Loading…
Reference in a new issue