diff options
author | Xavier Noria <fxn@hashref.com> | 2012-07-15 00:36:57 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2012-07-15 00:44:30 +0200 |
commit | aa6f5120a71dd04f54f248b6c60890bca6d82adc (patch) | |
tree | 822707ae9569ead643d22bd29d40209a5ecd169c /activesupport/lib | |
parent | 11563001daaa98112c7fed939ae95fca06489509 (diff) | |
download | rails-aa6f5120a71dd04f54f248b6c60890bca6d82adc.tar.gz rails-aa6f5120a71dd04f54f248b6c60890bca6d82adc.tar.bz2 rails-aa6f5120a71dd04f54f248b6c60890bca6d82adc.zip |
adds a missing require [fixes #6896]
This file uses Time.zone, which is defined in
active_support/core_ext/time/zones.rb.
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 1 | ||||
-rw-r--r-- | activesupport/lib/active_support/core_ext/time/zones.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index 0a71fc117c..d0f574f2ba 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -1,6 +1,7 @@ require 'active_support/duration' require 'active_support/core_ext/time/conversions' require 'active_support/time_with_zone' +require 'active_support/core_ext/time/zones' class Time COMMON_YEAR_DAYS_IN_MONTH = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] diff --git a/activesupport/lib/active_support/core_ext/time/zones.rb b/activesupport/lib/active_support/core_ext/time/zones.rb index e48866abe3..5f2fec3782 100644 --- a/activesupport/lib/active_support/core_ext/time/zones.rb +++ b/activesupport/lib/active_support/core_ext/time/zones.rb @@ -1,4 +1,3 @@ -require 'active_support/core_ext/time/calculations' require 'active_support/time_with_zone' class Time |