From 36a9644b86c53e322a891669cbdd2cf62cd648ac Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 1 Nov 2009 13:43:53 +0100
Subject: Clarify date/time dependencies

---
 activesupport/lib/active_support/core_ext/date/calculations.rb | 1 +
 activesupport/lib/active_support/core_ext/date/conversions.rb  | 1 +
 activesupport/lib/active_support/json/encoding.rb              | 3 ---
 activesupport/lib/active_support/time_with_zone.rb             | 1 +
 4 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'activesupport/lib')

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 = {
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index f440d6ce58..8e8f9022c1 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -6,10 +6,7 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/instance_variables'
 require 'active_support/deprecation'
 
-require 'active_support/core_ext/date_time/conversions'
-require 'active_support/core_ext/time/conversions'
 require 'active_support/time_with_zone'
-require 'active_support/values/time_zone'
 
 # Hack to load json gem first so we can overwrite its to_json.
 begin
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
index 4907fae9d6..a64128e49e 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -1,4 +1,5 @@
 require 'active_support/duration'
+require 'active_support/values/time_zone'
 require 'active_support/core_ext/numeric/time'
 require 'active_support/core_ext/integer/time'
 require 'active_support/core_ext/time/conversions'
-- 
cgit v1.2.3