aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorsnusnu <gamsnjaga@gmail.com>2010-03-18 18:40:22 +0100
committerwycats <wycats@gmail.com>2010-03-18 10:48:11 -0700
commitd164d868b3617b9e496cb76576c0ee0f20f7bdf5 (patch)
treebcc9d4fa849db329585be93aa237887c4ddb1507 /activesupport/lib
parent3911a7c197cf40fadab62d17def21db8a3d52f5e (diff)
downloadrails-d164d868b3617b9e496cb76576c0ee0f20f7bdf5.tar.gz
rails-d164d868b3617b9e496cb76576c0ee0f20f7bdf5.tar.bz2
rails-d164d868b3617b9e496cb76576c0ee0f20f7bdf5.zip
AS datetime conversions now require AS time conversions
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/date_time/conversions.rb1
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 47a31839a6..a9f821b01e 100644
--- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
@@ -1,4 +1,5 @@
require 'active_support/inflector'
+require 'active_support/core_ext/time/conversions'
class DateTime
# Ruby 1.9 has DateTime#to_time which internally relies on Time. We define our own #to_time which allows