aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-06-15 16:29:45 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-06-15 16:29:45 -0700
commit19c3495a671c364e0dc76c276efbcd9dc6914c74 (patch)
tree3e203f99bae6f06953f2956d84110a58420e97d2 /actionpack/lib/action_controller.rb
parent7b1f483fda4fc8e4fc931649364a211a9f9d945f (diff)
downloadrails-19c3495a671c364e0dc76c276efbcd9dc6914c74.tar.gz
rails-19c3495a671c364e0dc76c276efbcd9dc6914c74.tar.bz2
rails-19c3495a671c364e0dc76c276efbcd9dc6914c74.zip
rm -r controller/base!
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rw-r--r--actionpack/lib/action_controller.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 924c58e0e8..073600f69b 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -21,24 +21,24 @@ module ActionController
autoload :Caching, 'action_controller/caching'
autoload :Dispatcher, 'action_controller/dispatch/dispatcher'
autoload :Integration, 'action_controller/testing/integration'
- autoload :MimeResponds, 'action_controller/old_base/mime_responds'
+ autoload :MimeResponds, 'action_controller/base/mime_responds'
autoload :PolymorphicRoutes, 'action_controller/routing/generation/polymorphic_routes'
autoload :RecordIdentifier, 'action_controller/record_identifier'
autoload :Resources, 'action_controller/routing/resources'
- autoload :SessionManagement, 'action_controller/old_base/session_management'
+ autoload :SessionManagement, 'action_controller/base/session_management'
autoload :TestCase, 'action_controller/testing/test_case'
autoload :TestProcess, 'action_controller/testing/process'
autoload :UrlRewriter, 'action_controller/routing/generation/url_rewriter'
autoload :UrlWriter, 'action_controller/routing/generation/url_rewriter'
- autoload :Verification, 'action_controller/old_base/verification'
- autoload :Flash, 'action_controller/old_base/chained/flash'
- autoload :RequestForgeryProtection, 'action_controller/old_base/request_forgery_protection'
- autoload :Streaming, 'action_controller/old_base/streaming'
- autoload :HttpAuthentication, 'action_controller/old_base/http_authentication'
- autoload :FilterParameterLogging, 'action_controller/old_base/filter_parameter_logging'
+ autoload :Verification, 'action_controller/base/verification'
+ autoload :Flash, 'action_controller/base/flash'
+ autoload :RequestForgeryProtection, 'action_controller/base/request_forgery_protection'
+ autoload :Streaming, 'action_controller/base/streaming'
+ autoload :HttpAuthentication, 'action_controller/base/http_authentication'
+ autoload :FilterParameterLogging, 'action_controller/base/filter_parameter_logging'
autoload :Translation, 'action_controller/translation'
- autoload :Cookies, 'action_controller/old_base/cookies'
+ autoload :Cookies, 'action_controller/base/cookies'
require 'action_controller/routing'
end