Merge branch 'rails'

Conflicts:
	actionmailer/lib/action_mailer.rb
	actionmailer/lib/action_mailer/delivery_method/smtp.rb

1 files changed, 17 insertions, 13 deletions

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index 1a6c4278c9..109a3a3385 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -1,16 +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'
+require 'active_support/core_ext/module/attr_internal'
+require 'active_support/core_ext/module/delegation'
 
 module AbstractController
-  autoload :Base,                "abstract_controller/base"
-  autoload :Callbacks,           "abstract_controller/callbacks"
-  autoload :Helpers,             "abstract_controller/helpers"
-  autoload :Layouts,             "abstract_controller/layouts"
-  autoload :LocalizedCache,      "abstract_controller/localized_cache"
-  autoload :Logger,              "abstract_controller/logger"
-  autoload :RenderingController, "abstract_controller/rendering_controller"
-  # === Exceptions
-  autoload :ActionNotFound,      "abstract_controller/exceptions"
-  autoload :DoubleRenderError,   "abstract_controller/exceptions"
-  autoload :Error,               "abstract_controller/exceptions"
+  extend ActiveSupport::Autoload
+
+  deferrable do
+    autoload :Base
+    autoload :Callbacks
+    autoload :Helpers
+    autoload :Layouts
+    autoload :LocalizedCache
+    autoload :Logger
+    autoload :RenderingController
+  end
 end