diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-31 14:32:26 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-31 14:32:26 +0000 |
| commit | ed60021f39f7913537dcad181e4061e423dc6c3d (patch) | |
| tree | 86532c43aabe9125422f84b48a899f2672900bf5 /actionpack/lib/abstract_controller.rb | |
| parent | c6af337d2d6c86792cdc8132224ebe9294d35774 (diff) | |
| parent | b3a028259f373fd58fea2171a1e9e8b2fe3e253a (diff) | |
| download | rails-ed60021f39f7913537dcad181e4061e423dc6c3d.tar.gz rails-ed60021f39f7913537dcad181e4061e423dc6c3d.tar.bz2 rails-ed60021f39f7913537dcad181e4061e423dc6c3d.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
activemodel/lib/active_model/state_machine.rb
Diffstat (limited to 'actionpack/lib/abstract_controller.rb')
| -rw-r--r-- | actionpack/lib/abstract_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb index 2c2ef16622..1e15ab090c 100644 --- a/actionpack/lib/abstract_controller.rb +++ b/actionpack/lib/abstract_controller.rb @@ -2,6 +2,7 @@ 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/dependencies/autoload' require 'active_support/core_ext/module/attr_internal' require 'active_support/core_ext/module/delegation' @@ -11,11 +12,11 @@ module AbstractController autoload :Base autoload :Callbacks autoload :Collector + autoload :Compatibility autoload :Helpers autoload :Layouts autoload :LocalizedCache autoload :Logger autoload :Rendering autoload :Translation - autoload :UrlFor end |