aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-01-19 11:30:54 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-01-19 11:30:54 -0200
commit08848a0035e7b87cc32ec3ca9f8aa0769d6663c7 (patch)
tree2ec84463295f31c990b79673b3e822a1ba6b09b6 /activesupport/lib
parentcf01d36f020f06992cb3d7e6d818137166a78fcb (diff)
parent445957690a861e953d2185f5e9f051350c12969d (diff)
downloadrails-08848a0035e7b87cc32ec3ca9f8aa0769d6663c7.tar.gz
rails-08848a0035e7b87cc32ec3ca9f8aa0769d6663c7.tar.bz2
rails-08848a0035e7b87cc32ec3ca9f8aa0769d6663c7.zip
Merge pull request #18450 from tonytonyjan/patch-1
fix dependency
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/numeric/time.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/numeric/time.rb b/activesupport/lib/active_support/core_ext/numeric/time.rb
index ef32817f55..98716383f4 100644
--- a/activesupport/lib/active_support/core_ext/numeric/time.rb
+++ b/activesupport/lib/active_support/core_ext/numeric/time.rb
@@ -1,6 +1,8 @@
require 'active_support/duration'
require 'active_support/core_ext/time/calculations'
require 'active_support/core_ext/time/acts_like'
+require 'active_support/core_ext/date/calculations'
+require 'active_support/core_ext/date/acts_like'
class Numeric
# Enables the use of time calculations and declarations, like 45.minutes + 2.hours + 4.years.