diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-02-24 00:08:34 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-02-24 00:09:07 -0300 |
commit | e40518f5d44303ed91641b342a53bdfb32753de3 (patch) | |
tree | 7eefe3de8272e2ecb8999173008c6e6a5f67f61b /actionpack/lib/action_controller.rb | |
parent | 685cf69793d7548c292b7bf9c1203f09f80f1beb (diff) | |
parent | 338750393d0f19b193f0ead26adff2b9f586ec18 (diff) | |
download | rails-e40518f5d44303ed91641b342a53bdfb32753de3.tar.gz rails-e40518f5d44303ed91641b342a53bdfb32753de3.tar.bz2 rails-e40518f5d44303ed91641b342a53bdfb32753de3.zip |
Merge branch 'actionmailer-cache'
This is a rebased version of #22825.
Closes #22825.
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rw-r--r-- | actionpack/lib/action_controller.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 40f33a9de0..62f5905205 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -9,12 +9,15 @@ module ActionController autoload :API autoload :Base - autoload :Caching autoload :Metal autoload :Middleware autoload :Renderer autoload :FormBuilder + eager_autoload do + autoload :Caching + end + autoload_under "metal" do autoload :ConditionalGet autoload :Cookies @@ -47,11 +50,6 @@ module ActionController autoload :TestCase, 'action_controller/test_case' autoload :TemplateAssertions, 'action_controller/test_case' - - def self.eager_load! - super - ActionController::Caching.eager_load! - end end # Common Active Support usage in Action Controller |