diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-09-07 17:02:41 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-09-07 17:02:41 +0200 |
| commit | 92d170074c69a7fc564ec4a2e605fc322976fc9a (patch) | |
| tree | a7064af80e0c4337b2a49c76b8a2bfeba177d16e /activesupport | |
| parent | 8e155b0a9a4e387639be47d11e3a69c53ffb23ed (diff) | |
| parent | fd151670ebe6d50fb4df84ab10c04dca7ecbff19 (diff) | |
| download | rails-92d170074c69a7fc564ec4a2e605fc322976fc9a.tar.gz rails-92d170074c69a7fc564ec4a2e605fc322976fc9a.tar.bz2 rails-92d170074c69a7fc564ec4a2e605fc322976fc9a.zip | |
Merge pull request #20534 from qnm/activesupport-require-issue
Add require to ensure Time#advance works without implicit required
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 96156deebb..f13d09f3ad 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -3,6 +3,7 @@ require 'active_support/core_ext/time/conversions' require 'active_support/time_with_zone' require 'active_support/core_ext/time/zones' require 'active_support/core_ext/date_and_time/calculations' +require 'active_support/core_ext/date/calculations' class Time include DateAndTime::Calculations |