diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2015-11-05 02:11:02 -0200 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2015-11-05 02:11:02 -0200 |
| commit | 0ae22e5d8db809f369335519251610f0459ca359 (patch) | |
| tree | 3274c2ab712ab076a78ef2fa6c6d94253e81f56c /actionpack | |
| parent | 6cb1b6724c313c608cf4063fc22886faa19df9be (diff) | |
| parent | 23b6f65fd130c29e5f6ea69e09f6381cf7e34e27 (diff) | |
| download | rails-0ae22e5d8db809f369335519251610f0459ca359.tar.gz rails-0ae22e5d8db809f369335519251610f0459ca359.tar.bz2 rails-0ae22e5d8db809f369335519251610f0459ca359.zip | |
Merge pull request #22185 from jdantonio/cr-load-time
Require only necessary concurrent-ruby classes.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/controller/live_stream_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/dispatch/live_response_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb index 4224ac2a1b..843dafac06 100644 --- a/actionpack/test/controller/live_stream_test.rb +++ b/actionpack/test/controller/live_stream_test.rb @@ -1,5 +1,5 @@ require 'abstract_unit' -require 'concurrent/atomics' +require 'concurrent/atomic/count_down_latch' Thread.abort_on_exception = true module ActionController diff --git a/actionpack/test/dispatch/live_response_test.rb b/actionpack/test/dispatch/live_response_test.rb index 55becc1c91..160cdc1582 100644 --- a/actionpack/test/dispatch/live_response_test.rb +++ b/actionpack/test/dispatch/live_response_test.rb @@ -1,5 +1,5 @@ require 'abstract_unit' -require 'concurrent/atomics' +require 'concurrent/atomic/count_down_latch' module ActionController module Live |