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 13:47:38 -0700 |
| commit | 07875be977aae8d95df33a5fa43d30562cd2b1df (patch) | |
| tree | 6190cf428ee4e780c3354ae09aac3279c75fd5d2 | |
| parent | 1981159d3e16d473d8800926fcafeac3feab7d00 (diff) | |
| parent | e6d4dc3ec4e6e3d4dd9e5db6cdd91f691d546609 (diff) | |
| download | rails-07875be977aae8d95df33a5fa43d30562cd2b1df.tar.gz rails-07875be977aae8d95df33a5fa43d30562cd2b1df.tar.bz2 rails-07875be977aae8d95df33a5fa43d30562cd2b1df.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+
| -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 28c8b53b78..e8623a9c54 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] |