aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-02-23 19:55:49 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-02-23 21:11:15 -0300
commit40fa818580a9277d8d1a02241f1422dbf83a8aa1 (patch)
tree132e765683020927e21d920673a38b3220852c03 /actionpack/lib/action_controller/caching.rb
parent3d7b0d480467b17715941503b1fe598e57c13ac1 (diff)
downloadrails-40fa818580a9277d8d1a02241f1422dbf83a8aa1.tar.gz
rails-40fa818580a9277d8d1a02241f1422dbf83a8aa1.tar.bz2
rails-40fa818580a9277d8d1a02241f1422dbf83a8aa1.zip
Move Caching module to Abstract Controller
Abstract Controller is the common component between Action Mailer and Action Controller so if we need to share the caching component it need to be there.
Diffstat (limited to 'actionpack/lib/action_controller/caching.rb')
-rw-r--r--actionpack/lib/action_controller/caching.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index ff3678d952..9df4ab6c7a 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -1,5 +1,3 @@
-require 'action_dispatch/caching'
-
module ActionController
# \Caching is a cheap way of speeding up slow applications by keeping the result of
# calculations, renderings, and database calls around for subsequent requests.
@@ -26,7 +24,7 @@ module ActionController
extend ActiveSupport::Concern
included do
- include ActionDispatch::Caching
+ include AbstractController::Caching
end
def instrument_payload(key)