diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-12-06 10:40:48 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-12-06 10:40:48 -0800 |
commit | 12544f9422958117c5c7ed715d938eb5257d2505 (patch) | |
tree | 5556ecbf8929f04cbedbb7834c9e3c9ba8e87715 /activesupport | |
parent | 92812ba09d4b57962b47acbb3a9ff89ffd3b6f39 (diff) | |
parent | ec00442c10cb90796909e876fb1cc557ed7518bd (diff) | |
download | rails-12544f9422958117c5c7ed715d938eb5257d2505.tar.gz rails-12544f9422958117c5c7ed715d938eb5257d2505.tar.bz2 rails-12544f9422958117c5c7ed715d938eb5257d2505.zip |
Merge pull request #13213 from arunagw/aa-minitest-version-fix
Minitest upgrade broke build
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/testing/isolation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb index d5d31cecbe..18c48a7e0c 100644 --- a/activesupport/lib/active_support/testing/isolation.rb +++ b/activesupport/lib/active_support/testing/isolation.rb @@ -1,5 +1,5 @@ require 'rbconfig' -require 'minitest/parallel_each' +require 'minitest/parallel' module ActiveSupport module Testing |