diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-08-05 11:28:53 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-08-05 11:28:53 -0700 |
| commit | ab2582f417008aba3b5b683da13df58e55f7d5cd (patch) | |
| tree | 489cd1e59af3a2f9eeee81c184ac9d987995fef9 | |
| parent | 5a05207d99b7e2678f9b42db2d9ffc21ec2c8c3b (diff) | |
| parent | 780ee36c56d79f934ff123d63a5229e0311cade8 (diff) | |
| download | rails-ab2582f417008aba3b5b683da13df58e55f7d5cd.tar.gz rails-ab2582f417008aba3b5b683da13df58e55f7d5cd.tar.bz2 rails-ab2582f417008aba3b5b683da13df58e55f7d5cd.zip | |
Merge pull request #2439 from guilleiguaran/fix-error-on-ar-tests-rbxday
Fix AR test suite error under Rubinius 2.0 #rbxday
| -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 c5fbbcf890..a15a06d0e4 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/zones' +require 'active_support/core_ext/time/conversions' class Time COMMON_YEAR_DAYS_IN_MONTH = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] |