diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 01:09:27 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 01:09:27 +0100 |
| commit | 5a1fe9039b33414b7088813712e03bbe38567cff (patch) | |
| tree | 10e3a15c06494dd09c0324dca894ddcbb68ce582 /activesupport/lib/active_support.rb | |
| parent | 3384f073e35c5391deaeb209a62a485a0c4dd7b1 (diff) | |
| parent | 7f6779c1d5e4ec7f642839caa7e86320720f77c8 (diff) | |
| download | rails-5a1fe9039b33414b7088813712e03bbe38567cff.tar.gz rails-5a1fe9039b33414b7088813712e03bbe38567cff.tar.bz2 rails-5a1fe9039b33414b7088813712e03bbe38567cff.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'activesupport/lib/active_support.rb')
| -rw-r--r-- | activesupport/lib/active_support.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index dbd30f9271..0879535487 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -23,7 +23,7 @@ module ActiveSupport def self.load_all! - [Dependencies, Deprecation, Gzip, MessageVerifier, Multibyte, SecureRandom, TimeWithZone] + [Dependencies, Deprecation, Gzip, MessageVerifier, Multibyte, SecureRandom] + Core.load_all! end autoload :BacktraceCleaner, 'active_support/backtrace_cleaner' @@ -35,7 +35,6 @@ module ActiveSupport autoload :NewCallbacks, 'active_support/new_callbacks' autoload :ConcurrentHash, 'active_support/concurrent_hash' autoload :Deprecation, 'active_support/deprecation' - autoload :Duration, 'active_support/duration' autoload :Gzip, 'active_support/gzip' autoload :Inflector, 'active_support/inflector' autoload :Memoizable, 'active_support/memoizable' @@ -48,14 +47,9 @@ module ActiveSupport autoload :Rescuable, 'active_support/rescuable' autoload :SecureRandom, 'active_support/secure_random' autoload :StringInquirer, 'active_support/string_inquirer' - autoload :TimeWithZone, 'active_support/time_with_zone' - autoload :TimeZone, 'active_support/values/time_zone' autoload :XmlMini, 'active_support/xml_mini' 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" |