diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2019-03-19 11:37:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 11:37:19 +0000 |
| commit | 4a797074e40916d85012461a92310b46d396428a (patch) | |
| tree | 80ad40dcde6fafb24c0e0f02a7120bcdb384b5a7 /activesupport/lib | |
| parent | 6e94127dd21271f3fcebc865c23974a75de20f3c (diff) | |
| parent | 58ac3f212f0dca31d8dc3c35ba13c14581d8b5f3 (diff) | |
| download | rails-4a797074e40916d85012461a92310b46d396428a.tar.gz rails-4a797074e40916d85012461a92310b46d396428a.tar.bz2 rails-4a797074e40916d85012461a92310b46d396428a.zip | |
Merge pull request #35659 from rails/fix-time-advance-with-historical-dates
Fix Time#advance to work with dates before 1001-03-07
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index 120768dec5..f09a6271ad 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -170,8 +170,7 @@ class Time options[:hours] = options.fetch(:hours, 0) + 24 * partial_days end - d = to_date.advance(options) - d = d.gregorian if d.julian? + d = to_date.gregorian.advance(options) time_advanced_by_date = change(year: d.year, month: d.month, day: d.day) seconds_to_advance = \ options.fetch(:seconds, 0) + |