aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rwxr-xr-xactionpack/lib/action_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index acf547f64a..d090fd4166 100755
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -39,6 +39,7 @@ require 'action_controller/scaffolding'
require 'action_controller/helpers'
require 'action_controller/cookies'
require 'action_controller/cgi_process'
+require 'action_controller/caching'
ActionController::Base.class_eval do
include ActionController::Filters
@@ -51,6 +52,7 @@ ActionController::Base.class_eval do
include ActionController::Helpers
include ActionController::Cookies
include ActionController::Session
+ include ActionController::Caching
end
require 'action_view'