Merge pull request rails#10414 from eiel/fix_dependency

fxn · fxn · commit 8297ace92289 · 2013-05-02T01:13:57.000-07:00
Fixes Dependency bug in Active Support
diff --git a/activesupport/lib/active_support/core_ext/date_time/calculations.rb b/activesupport/lib/active_support/core_ext/date_time/calculations.rb
@@ -1,3 +1,4 @@
+require 'date'
 require 'active_support/deprecation'
 
 class DateTime
diff --git a/activesupport/lib/active_support/core_ext/date_time/conversions.rb b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
@@ -1,3 +1,4 @@
+require 'date'
 require 'active_support/inflector/methods'
 require 'active_support/core_ext/time/conversions'
 require 'active_support/core_ext/date_time/calculations'
diff --git a/activesupport/lib/active_support/core_ext/date_time/zones.rb b/activesupport/lib/active_support/core_ext/date_time/zones.rb
@@ -1,3 +1,4 @@
+require 'date'
 require 'active_support/core_ext/time/zones'
 
 class DateTime

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+require 'date'`
`1`	`2`	`require 'active_support/deprecation'`
`2`	`3`
`3`	`4`	`class DateTime`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+require 'date'`
`1`	`2`	`require 'active_support/inflector/methods'`
`2`	`3`	`require 'active_support/core_ext/time/conversions'`
`3`	`4`	`require 'active_support/core_ext/date_time/calculations'`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+require 'date'`
`1`	`2`	`require 'active_support/core_ext/time/zones'`
`2`	`3`
`3`	`4`	`class DateTime`