diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-01 13:43:53 +0100 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-02 17:50:12 -0800 |
| commit | 36a9644b86c53e322a891669cbdd2cf62cd648ac (patch) | |
| tree | 7885dc5427219a3fe56c6e434b401758786cceca /activesupport/lib/active_support/core_ext | |
| parent | b540eca5889d7a28fac39c9ec0df715aa89487ce (diff) | |
| download | rails-36a9644b86c53e322a891669cbdd2cf62cd648ac.tar.gz rails-36a9644b86c53e322a891669cbdd2cf62cd648ac.tar.bz2 rails-36a9644b86c53e322a891669cbdd2cf62cd648ac.zip | |
Clarify date/time dependencies
Diffstat (limited to 'activesupport/lib/active_support/core_ext')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/date/calculations.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/date/conversions.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb index ce3bebc25a..3dd61334d0 100644 --- a/activesupport/lib/active_support/core_ext/date/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date/calculations.rb @@ -1,4 +1,5 @@ require 'active_support/duration' +require 'active_support/core_ext/time/zones' class Date class << self diff --git a/activesupport/lib/active_support/core_ext/date/conversions.rb b/activesupport/lib/active_support/core_ext/date/conversions.rb index 54facf4430..b41ad5b686 100644 --- a/activesupport/lib/active_support/core_ext/date/conversions.rb +++ b/activesupport/lib/active_support/core_ext/date/conversions.rb @@ -1,6 +1,7 @@ require 'active_support/inflector' require 'active_support/core_ext/time/conversions' require 'active_support/core_ext/date_time/conversions' +require 'active_support/values/time_zone' class Date DATE_FORMATS = { |