diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-14 01:13:54 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-14 01:13:54 -0800 |
| commit | 7eb4f2ecc53831d850682d88634ccf41676e40a2 (patch) | |
| tree | f479473e4879a22c07d694e07e2a21123824b7f5 /activesupport/lib/active_support/time.rb | |
| parent | 92253829dee9a1fb545f71f71894dee1df604f74 (diff) | |
| download | rails-7eb4f2ecc53831d850682d88634ccf41676e40a2.tar.gz rails-7eb4f2ecc53831d850682d88634ccf41676e40a2.tar.bz2 rails-7eb4f2ecc53831d850682d88634ccf41676e40a2.zip | |
Consolidate date & time landscape: require 'active_support/time'
Diffstat (limited to 'activesupport/lib/active_support/time.rb')
| -rw-r--r-- | activesupport/lib/active_support/time.rb | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/time.rb b/activesupport/lib/active_support/time.rb index d36a683601..1362f6997c 100644 --- a/activesupport/lib/active_support/time.rb +++ b/activesupport/lib/active_support/time.rb @@ -1,7 +1,4 @@ require 'active_support' -require 'active_support/core_ext/time' -require 'active_support/core_ext/date' -require 'active_support/core_ext/date_time' module ActiveSupport autoload :Duration, 'active_support/duration' @@ -12,3 +9,23 @@ module ActiveSupport [Duration, TimeWithZone, TimeZone] end end + +require 'date' +require 'time' + +require 'active_support/core_ext/time/publicize_conversion_methods' +require 'active_support/core_ext/time/marshal_with_utc_flag' +require 'active_support/core_ext/time/acts_like' +require 'active_support/core_ext/time/calculations' +require 'active_support/core_ext/time/conversions' +require 'active_support/core_ext/time/zones' + +require 'active_support/core_ext/date/acts_like' +require 'active_support/core_ext/date/freeze' +require 'active_support/core_ext/date/calculations' +require 'active_support/core_ext/date/conversions' + +require 'active_support/core_ext/date_time/acts_like' +require 'active_support/core_ext/date_time/calculations' +require 'active_support/core_ext/date_time/conversions' +require 'active_support/core_ext/date_time/zones' |