aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-18 06:08:06 -0700
committerJosé Valim <jose.valim@gmail.com>2011-05-18 06:08:06 -0700
commit9968b95b6035bb0d2fa115d3effb83eaae7d63ad (patch)
tree6e5dfd6607b9a4c26cc7f0d17cdf29530d73dd39
parent1ccacd4ee31de068d322ebf040a988ef48e17608 (diff)
parent3018f4727621b6f2b117a2b5d75561127f2a8592 (diff)
downloadrails-9968b95b6035bb0d2fa115d3effb83eaae7d63ad.tar.gz
rails-9968b95b6035bb0d2fa115d3effb83eaae7d63ad.tar.bz2
rails-9968b95b6035bb0d2fa115d3effb83eaae7d63ad.zip
Merge pull request #1117 from joshk/as_numeric_time
Add some missing requires for AS core_ext/numeric/time. Closes #1038
-rw-r--r--activesupport/lib/active_support/core_ext/numeric/time.rb2
-rw-r--r--activesupport/lib/active_support/core_ext/time/calculations.rb1
2 files changed, 3 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 e73915ffcf..58a03d508e 100644
--- a/activesupport/lib/active_support/core_ext/numeric/time.rb
+++ b/activesupport/lib/active_support/core_ext/numeric/time.rb
@@ -1,4 +1,6 @@
require 'active_support/duration'
+require 'active_support/core_ext/time/calculations'
+require 'active_support/core_ext/time/acts_like'
class Numeric
# Enables the use of time calculations and declarations, like 45.minutes + 2.hours + 4.years.
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index dcac17536a..00fda2b370 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -1,4 +1,5 @@
require 'active_support/duration'
+require 'active_support/core_ext/time/zones'
class Time
COMMON_YEAR_DAYS_IN_MONTH = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]