aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-04-20 18:14:39 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-04-20 18:14:39 -0700
commitdb05c73fb6e2294c576ef9889c70940891682c32 (patch)
tree7b08643dd887d344fad99dd2a0b4d3aa953826bd /activesupport/lib
parent4f63e848433f16652f3776e814316ce1891bd0ff (diff)
downloadrails-db05c73fb6e2294c576ef9889c70940891682c32.tar.gz
rails-db05c73fb6e2294c576ef9889c70940891682c32.tar.bz2
rails-db05c73fb6e2294c576ef9889c70940891682c32.zip
Move AS::Duration autoload to core/time/autoload
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support.rb1
-rw-r--r--activesupport/lib/active_support/core/time/autoload.rb1
2 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index d049740002..e4fa3b40e5 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -33,7 +33,6 @@ module ActiveSupport
autoload :Cache, 'active_support/cache'
autoload :Callbacks, 'active_support/callbacks'
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'
diff --git a/activesupport/lib/active_support/core/time/autoload.rb b/activesupport/lib/active_support/core/time/autoload.rb
index 6970c398c3..c9a7731b39 100644
--- a/activesupport/lib/active_support/core/time/autoload.rb
+++ b/activesupport/lib/active_support/core/time/autoload.rb
@@ -1,4 +1,5 @@
module ActiveSupport
+ autoload :Duration, 'active_support/duration'
autoload :TimeWithZone, 'active_support/time_with_zone'
autoload :TimeZone, 'active_support/values/time_zone'
end