aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-05-03 23:11:09 +0200
committerXavier Noria <fxn@hashref.com>2010-05-03 23:11:09 +0200
commit6704d8c994d9d20d0cc9d71b72521e141c7dc05d (patch)
treef35ab892c38638e99c4badc44862ad64bd673508 /activesupport
parent5d7d0c2fa31d72bc70fdd1b1e34144da9055995d (diff)
downloadrails-6704d8c994d9d20d0cc9d71b72521e141c7dc05d.tar.gz
rails-6704d8c994d9d20d0cc9d71b72521e141c7dc05d.tar.bz2
rails-6704d8c994d9d20d0cc9d71b72521e141c7dc05d.zip
date/conversions needs time/calculations for (utc|local)_time
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/date/conversions.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/date/conversions.rb b/activesupport/lib/active_support/core_ext/date/conversions.rb
index 90ab1eb281..13ef703f49 100644
--- a/activesupport/lib/active_support/core_ext/date/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date/conversions.rb
@@ -1,5 +1,6 @@
require 'date'
require 'active_support/inflector'
+require 'active_support/core_ext/time/calculations'
class Date
DATE_FORMATS = {