diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2012-12-11 12:23:30 +0000 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2012-12-11 12:23:30 +0000 |
| commit | f0a9e2f8520240dea3c23c4b971fb45d1c83eeaa (patch) | |
| tree | 51688db36b017694ecad6f4b57e9dc17d014004a /activesupport | |
| parent | 2d3b1dabc9848983e4d0c8f96cd1a600761254a1 (diff) | |
| download | rails-f0a9e2f8520240dea3c23c4b971fb45d1c83eeaa.tar.gz rails-f0a9e2f8520240dea3c23c4b971fb45d1c83eeaa.tar.bz2 rails-f0a9e2f8520240dea3c23c4b971fb45d1c83eeaa.zip | |
Clean up 'active_support/time' requires
Rely on the hub files for Time, Date and DateTime classes and
add the requires for String#to_time and String#in_time_zone.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/time.rb | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/activesupport/lib/active_support/time.rb b/activesupport/lib/active_support/time.rb index bcd5d78b54..92a593965e 100644 --- a/activesupport/lib/active_support/time.rb +++ b/activesupport/lib/active_support/time.rb @@ -9,21 +9,12 @@ end require 'date' require 'time' -require 'active_support/core_ext/time/marshal' -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/calculations' -require 'active_support/core_ext/date/conversions' -require 'active_support/core_ext/date/zones' - -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' +require 'active_support/core_ext/time' +require 'active_support/core_ext/date' +require 'active_support/core_ext/date_time' require 'active_support/core_ext/integer/time' require 'active_support/core_ext/numeric/time' + +require 'active_support/core_ext/string/conversions' +require 'active_support/core_ext/string/zones' |