diff options
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/.ruby-version | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/.ruby-version b/activesupport/.ruby-version new file mode 100644 index 0000000000..7d2ed7c702 --- /dev/null +++ b/activesupport/.ruby-version @@ -0,0 +1 @@ +2.1.4 diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index c554501893..5fdd032fac 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 |