diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 7 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/caching/fragments.rb (renamed from actionpack/lib/action_controller/caching/fragments.rb) | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 0b8fa2ea09..ae868e23ed 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -1,3 +1,4 @@ +require 'action_dispatch/caching/fragments' require 'fileutils' require 'uri' @@ -26,10 +27,6 @@ module ActionController extend ActiveSupport::Concern extend ActiveSupport::Autoload - eager_autoload do - autoload :Fragments - end - module ConfigMethods def cache_store config.cache_store @@ -48,7 +45,7 @@ module ActionController include AbstractController::Callbacks include ConfigMethods - include Fragments + include ActionDispatch::Caching::Fragments included do extend ConfigMethods diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_dispatch/caching/fragments.rb index b9ad51a9cf..c410aaf03a 100644 --- a/actionpack/lib/action_controller/caching/fragments.rb +++ b/actionpack/lib/action_dispatch/caching/fragments.rb @@ -1,4 +1,4 @@ -module ActionController +module ActionDispatch module Caching # Fragment caching is used for caching various blocks within # views without caching the entire action as a whole. This is |