diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-04-18 17:25:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-18 17:25:19 -0400 |
| commit | 48c5139ae31328532e22b1726a67cfa40dbd680d (patch) | |
| tree | 55bdc4d59b53d05d84dcfbb00344558a884daf2d | |
| parent | c30eddb81a87ba5c4f68c3309b9ae4d2e02386aa (diff) | |
| parent | 1d82b7ce7c96b86e8ef44b2eba12bccd2bd14331 (diff) | |
| download | rails-48c5139ae31328532e22b1726a67cfa40dbd680d.tar.gz rails-48c5139ae31328532e22b1726a67cfa40dbd680d.tar.bz2 rails-48c5139ae31328532e22b1726a67cfa40dbd680d.zip | |
Merge pull request #28790 from tjschuck/require_as_time_in_testing_time_helpers
Explicitly require AS::Time in AS::Testing::TimeHelpers
| -rw-r--r-- | activesupport/lib/active_support/testing/time_helpers.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/testing/time_helpers.rb b/activesupport/lib/active_support/testing/time_helpers.rb index 07c9be0604..3d9ff99729 100644 --- a/activesupport/lib/active_support/testing/time_helpers.rb +++ b/activesupport/lib/active_support/testing/time_helpers.rb @@ -1,4 +1,5 @@ require "active_support/core_ext/string/strip" # for strip_heredoc +require "active_support/core_ext/time/calculations" require "concurrent/map" module ActiveSupport |