aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2009-12-22 17:31:29 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2009-12-22 17:31:29 -0800
commite7ef57dd0ddec3d487d3ffd58ff028bdf11a33f9 (patch)
treedfc9e049c937a56c2fc1e80ae8e8b71880d1615d /actionpack/lib/abstract_controller.rb
parentec095456d859da4a09c7401585c211dc0f01fccd (diff)
parentf737c2d69bb3659a553c7c0e21e316b1a4a1b98a (diff)
downloadrails-e7ef57dd0ddec3d487d3ffd58ff028bdf11a33f9.tar.gz
rails-e7ef57dd0ddec3d487d3ffd58ff028bdf11a33f9.tar.bz2
rails-e7ef57dd0ddec3d487d3ffd58ff028bdf11a33f9.zip
Merge
Diffstat (limited to 'actionpack/lib/abstract_controller.rb')
-rw-r--r--actionpack/lib/abstract_controller.rb16
1 files changed, 7 insertions, 9 deletions
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index c15a1da98a..237ab577ba 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -8,13 +8,11 @@ require 'active_support/core_ext/module/delegation'
module AbstractController
extend ActiveSupport::Autoload
- deferrable do
- autoload :Base
- autoload :Callbacks
- autoload :Helpers
- autoload :Layouts
- autoload :LocalizedCache
- autoload :Logger
- autoload :Rendering
- end
+ autoload :Base
+ autoload :Callbacks
+ autoload :Helpers
+ autoload :Layouts
+ autoload :LocalizedCache
+ autoload :Logger
+ autoload :Rendering
end