Merge branch 'master' of git://github.com/rails/rails

1 files changed, 14 insertions, 15 deletions

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index 688a2fe31c..c15a1da98a 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -1,21 +1,20 @@
-require "active_support/core_ext/module/attr_internal"
-require "active_support/core_ext/module/delegation"
+activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
+$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
+
+require 'active_support/ruby/shim'
+require 'active_support/core_ext/module/attr_internal'
+require 'active_support/core_ext/module/delegation'
 
 module AbstractController
   extend ActiveSupport::Autoload
 
-  autoload :Base
-  autoload :Callbacks
-  autoload :Helpers
-  autoload :Layouts
-  autoload :LocalizedCache
-  autoload :Logger
-  autoload :RenderingController
-
-  # === Exceptions
-  autoload_at "abstract_controller/exceptions" do
-    autoload :ActionNotFound
-    autoload :DoubleRenderError
-    autoload :Error
+  deferrable do
+    autoload :Base
+    autoload :Callbacks
+    autoload :Helpers
+    autoload :Layouts
+    autoload :LocalizedCache
+    autoload :Logger
+    autoload :Rendering
   end
 end