aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJimmy Cuadra <jimmy@jimmycuadra.com>2015-06-04 13:20:43 -0700
committerJimmy Cuadra <jimmy@jimmycuadra.com>2015-06-04 13:20:43 -0700
commitbb5ffb77ccf5771468e1807dfdb476ce70f51519 (patch)
treeb72533a639b26cc154770d38c1bf529a28a95ac7 /activesupport
parent7220ffcffd0085b3caee872102b3b28f3ca35c83 (diff)
downloadrails-bb5ffb77ccf5771468e1807dfdb476ce70f51519.tar.gz
rails-bb5ffb77ccf5771468e1807dfdb476ce70f51519.tar.bz2
rails-bb5ffb77ccf5771468e1807dfdb476ce70f51519.zip
Require active_support/duration.
ActiveSupport::TimeWithZone references `ActiveSupport::Duration` but does not require it, which can result in a `LoadError` when required directly without requiring a component less granular like `active_support/time`, where the autoload for `ActiveSupport::Duration` is set up.
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/time_with_zone.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
index b0d7f3299f..412c72d27c 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -1,3 +1,4 @@
+require 'active_support/duration'
require 'active_support/values/time_zone'
require 'active_support/core_ext/object/acts_like'