diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-24 22:42:11 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-24 22:42:11 -0800 |
commit | b6fd6ccc8fd93997db035553ce0bb35bf0856635 (patch) | |
tree | a1a6be0ab303165e74cb25e62d66ddb2be8f3c7f /activesupport/lib/active_support.rb | |
parent | 6482db8669aecffc4c2887ebed874b685434c17b (diff) | |
download | rails-b6fd6ccc8fd93997db035553ce0bb35bf0856635.tar.gz rails-b6fd6ccc8fd93997db035553ce0bb35bf0856635.tar.bz2 rails-b6fd6ccc8fd93997db035553ce0bb35bf0856635.zip |
AS::Dependencies also has core extensions; don't autoload it.
Diffstat (limited to 'activesupport/lib/active_support.rb')
-rw-r--r-- | activesupport/lib/active_support.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 3758f63eb0..08d9ff1fe8 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -32,7 +32,6 @@ module ActiveSupport autoload :BufferedLogger, 'active_support/buffered_logger' autoload :Cache, 'active_support/cache' autoload :Callbacks, 'active_support/callbacks' - autoload :Dependencies, 'active_support/dependencies' autoload :Deprecation, 'active_support/deprecation' autoload :Duration, 'active_support/duration' autoload :Gzip, 'active_support/gzip' @@ -52,6 +51,7 @@ end require 'active_support/vendor' require 'active_support/core_ext' +require 'active_support/dependencies' require 'active_support/json' I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml" |