diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-19 18:04:17 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-19 18:11:44 -0700 |
| commit | 0e7da0e4a06f78ab39b0e90daadfc223b8f1738a (patch) | |
| tree | b4350912e92be9303d4eb7240faa60e6bcbc8a18 | |
| parent | 26f2be01c2d537aac6d484c8a1ed2df92aa52f00 (diff) | |
| download | rails-0e7da0e4a06f78ab39b0e90daadfc223b8f1738a.tar.gz rails-0e7da0e4a06f78ab39b0e90daadfc223b8f1738a.tar.bz2 rails-0e7da0e4a06f78ab39b0e90daadfc223b8f1738a.zip | |
Include caching module into new base
| -rw-r--r-- | actionpack/lib/action_controller/new_base.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/new_base/base.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/new_base.rb b/actionpack/lib/action_controller/new_base.rb index bc47713529..078f66ced1 100644 --- a/actionpack/lib/action_controller/new_base.rb +++ b/actionpack/lib/action_controller/new_base.rb @@ -13,6 +13,7 @@ module ActionController # Ported modules # require 'action_controller/routing' + autoload :Caching, 'action_controller/caching' autoload :Dispatcher, 'action_controller/dispatch/dispatcher' autoload :PolymorphicRoutes, 'action_controller/routing/generation/polymorphic_routes' autoload :RecordIdentifier, 'action_controller/record_identifier' diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb index 756a0799fe..7f830307b6 100644 --- a/actionpack/lib/action_controller/new_base/base.rb +++ b/actionpack/lib/action_controller/new_base/base.rb @@ -17,6 +17,7 @@ module ActionController # Legacy modules include SessionManagement include ActionDispatch::StatusCodes + include ActionController::Caching # Rails 2.x compatibility include ActionController::Rails2Compatibility |