aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorYehuda Katz <wycats@Yehuda-Katz.local>2009-12-20 17:03:38 -0800
committerYehuda Katz <wycats@Yehuda-Katz.local>2009-12-20 17:03:38 -0800
commit33a6bd390affdeb0b403f513be92a5b1547f6e4e (patch)
treefc4b2f446a9d00c7b3e44e7a75712b962ef3accf /activesupport
parente48b4c2dd01877ace901e1c186d04605b53b40d0 (diff)
downloadrails-33a6bd390affdeb0b403f513be92a5b1547f6e4e.tar.gz
rails-33a6bd390affdeb0b403f513be92a5b1547f6e4e.tar.bz2
rails-33a6bd390affdeb0b403f513be92a5b1547f6e4e.zip
Fixes Dependency bug in ActiveSupport
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/date/calculations.rb1
-rw-r--r--activesupport/lib/active_support/core_ext/date/conversions.rb1
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 3dd61334d0..2b76b93153 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -1,3 +1,4 @@
+require 'date'
require 'active_support/duration'
require 'active_support/core_ext/time/zones'
diff --git a/activesupport/lib/active_support/core_ext/date/conversions.rb b/activesupport/lib/active_support/core_ext/date/conversions.rb
index f6c870035b..90ab1eb281 100644
--- a/activesupport/lib/active_support/core_ext/date/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date/conversions.rb
@@ -1,3 +1,4 @@
+require 'date'
require 'active_support/inflector'
class Date