diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2018-11-19 09:35:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-19 09:35:55 -0800 |
| commit | 9893998f4a8d3edd64ab0c8efbfb3c385e33befa (patch) | |
| tree | e5f5f2bb9a112c16c503ca2dce5458f28eb8d8f0 /activesupport/lib/active_support/testing | |
| parent | 317bf45c24e6d78ec5349eadd2683aca7e7fe7e8 (diff) | |
| parent | 0712dfd6ae1423269af1512c3403ee1145f27de1 (diff) | |
| download | rails-9893998f4a8d3edd64ab0c8efbfb3c385e33befa.tar.gz rails-9893998f4a8d3edd64ab0c8efbfb3c385e33befa.tar.bz2 rails-9893998f4a8d3edd64ab0c8efbfb3c385e33befa.zip | |
Merge pull request #34410 from gmcgibbon/test_support_windows
Windows support for parallelization and instrumenter
Diffstat (limited to 'activesupport/lib/active_support/testing')
| -rw-r--r-- | activesupport/lib/active_support/testing/parallelization.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/parallelization.rb b/activesupport/lib/active_support/testing/parallelization.rb index 24c4f18931..8de01eb19b 100644 --- a/activesupport/lib/active_support/testing/parallelization.rb +++ b/activesupport/lib/active_support/testing/parallelization.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "drb" -require "drb/unix" +require "drb/unix" unless Gem.win_platform? require "active_support/core_ext/module/attribute_accessors" module ActiveSupport |