diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-14 11:06:20 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-14 11:06:20 -0700 |
| commit | 468a55b741f2ceacd8a988a9487db6d767ca8616 (patch) | |
| tree | cbf935eda9855db7f9d568b599f7c63246a29399 /Gemfile.lock | |
| parent | 7645a5f85d7fc88b5f05f7fe4b73b743078bb069 (diff) | |
| parent | 284a9ba8ecbbaac598179af6fc65aed7bcf5785b (diff) | |
| download | rails-468a55b741f2ceacd8a988a9487db6d767ca8616.tar.gz rails-468a55b741f2ceacd8a988a9487db6d767ca8616.tar.bz2 rails-468a55b741f2ceacd8a988a9487db6d767ca8616.zip | |
Merge pull request #20866 from jdantonio/countdown-latch
Replace `ActiveSupport::Concurrency::Latch` with `Concurrent::CountDownLatch` from concurrent-ruby.
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 960a77af92..e44a2fc2ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,6 +64,7 @@ PATH actionpack (5.0.0.alpha) actionview (= 5.0.0.alpha) activesupport (= 5.0.0.alpha) + concurrent-ruby (~> 0.9.0) rack (~> 1.6) rack-test (~> 0.6.3) rails-dom-testing (~> 1.0, >= 1.0.5) @@ -85,6 +86,7 @@ PATH activesupport (= 5.0.0.alpha) arel (= 7.0.0.alpha) activesupport (5.0.0.alpha) + concurrent-ruby (~> 0.9.0) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -135,6 +137,7 @@ GEM execjs coffee-script-source (1.9.0) columnize (0.9.0) + concurrent-ruby (0.9.0) connection_pool (2.1.1) dalli (2.7.2) dante (0.1.5) |