From 19c3495a671c364e0dc76c276efbcd9dc6914c74 Mon Sep 17 00:00:00 2001 From: Yehuda Katz + Carl Lerche Date: Mon, 15 Jun 2009 16:29:45 -0700 Subject: rm -r controller/base! --- actionpack/lib/action_controller.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'actionpack/lib/action_controller.rb') 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 -- cgit v1.2.3