diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-07-03 12:46:38 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-07-03 12:46:38 -0700 |
| commit | 070c24232f74c75b60757ff2bd3cc00ea662d5a6 (patch) | |
| tree | 7d5c5c3635571fcfd06144f2dff7057e470105b3 /activesupport/lib/active_support/core_ext/date_time/conversions.rb | |
| parent | 54250a5bfe6992afaaca6357d3b414e6c49651ba (diff) | |
| parent | 075f8b72418f2d2ce9c2038bd57139955f6e46ec (diff) | |
| download | rails-070c24232f74c75b60757ff2bd3cc00ea662d5a6.tar.gz rails-070c24232f74c75b60757ff2bd3cc00ea662d5a6.tar.bz2 rails-070c24232f74c75b60757ff2bd3cc00ea662d5a6.zip | |
Merge remote branch 'spastorino/master'
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date_time/conversions.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/date_time/conversions.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/conversions.rb b/activesupport/lib/active_support/core_ext/date_time/conversions.rb index c3f0acce25..47b8aa59fb 100644 --- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb @@ -1,6 +1,7 @@ require 'active_support/inflector' require 'active_support/core_ext/time/conversions' require 'active_support/core_ext/date_time/calculations' +require 'active_support/values/time_zone' class DateTime # Ruby 1.9 has DateTime#to_time which internally relies on Time. We define our own #to_time which allows |