diff options
| author | Tomohiko Himura <eiel.hal@gmail.com> | 2013-05-02 16:02:00 +0900 |
|---|---|---|
| committer | Tomohiko Himura <eiel.hal@gmail.com> | 2013-05-02 16:23:58 +0900 |
| commit | 6f6c0b0ae2bdbcff0da6b2be450a7d21816a27a6 (patch) | |
| tree | d43e1afee53557deb53562bda4eeadf470e7da95 /activesupport | |
| parent | dfd5dc93a1ead62353cc33f5065e23b4fdf25b3e (diff) | |
| download | rails-6f6c0b0ae2bdbcff0da6b2be450a7d21816a27a6.tar.gz rails-6f6c0b0ae2bdbcff0da6b2be450a7d21816a27a6.tar.bz2 rails-6f6c0b0ae2bdbcff0da6b2be450a7d21816a27a6.zip | |
Fixes Dependency bug in Active Support
DateTime defined in date.rb
Diffstat (limited to 'activesupport')
3 files changed, 3 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/calculations.rb b/activesupport/lib/active_support/core_ext/date_time/calculations.rb index 9f0864d9bb..f347f09293 100644 --- 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 index b7d8414a9d..df07917d19 100644 --- 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 index 6457ffbaf6..01a627f8af 100644 --- 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 |