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:10 +0200 |
| commit | b3693bf2f827789a8b1ef5e0a3f653ed58089b1e (patch) | |
| tree | ea45b4f6a5dc4dcb1bc210f1a9adee5fb0f6494b /activesupport | |
| parent | f7ef7caac634eba23fb339a5bcfe4734e216d04d (diff) | |
| download | rails-b3693bf2f827789a8b1ef5e0a3f653ed58089b1e.tar.gz rails-b3693bf2f827789a8b1ef5e0a3f653ed58089b1e.tar.bz2 rails-b3693bf2f827789a8b1ef5e0a3f653ed58089b1e.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')
| -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 d6ccd6955a..34d4d88bd3 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 b4ed74a7b0..0c5962858e 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 |