diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-06-25 13:47:38 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-06-25 19:24:26 -0300 |
| commit | 3fccf6af7d389445089195c7c28d95e9bce40364 (patch) | |
| tree | 0f675bac8f2f532b4d571c3796fb7212c6a66a63 /activesupport | |
| parent | f8f4ac91203506c94d547ee0ef530bd60faf97ed (diff) | |
| download | rails-3fccf6af7d389445089195c7c28d95e9bce40364.tar.gz rails-3fccf6af7d389445089195c7c28d95e9bce40364.tar.bz2 rails-3fccf6af7d389445089195c7c28d95e9bce40364.zip | |
Merge pull request #6857 from rsutphin/as_core_ext_time_missing_require
Missing require breaks Time.=== when selectively loading ActiveSupport core_exts in 3.2.4+
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index 5743254462..d6ccd6955a 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -1,5 +1,6 @@ require 'active_support/duration' require 'active_support/core_ext/time/conversions' +require 'active_support/time_with_zone' class Time COMMON_YEAR_DAYS_IN_MONTH = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] |