diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-06-03 01:50:18 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-06-03 01:50:18 +0000 |
| commit | 96744d0befd7e298c08e6d20a4f504086a717c35 (patch) | |
| tree | 8dfdf394a7976829dddc152851eb806a2f557547 | |
| parent | 767c953a284b7cfe6b76b1ed874792b8724246cb (diff) | |
| parent | fe0c53805d53a0276a31f0c5d754a6602d55bed6 (diff) | |
| download | gitlab-ce-96744d0befd7e298c08e6d20a4f504086a717c35.tar.gz | |
Merge branch 'sh-bump-ruby-concurrency-gem' into 'master'
Bump concurrent-ruby and concurrent-ruby-ext to 1.1.5
See merge request gitlab-org/gitlab-ce!29015
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3f85fa958bd..b869c9923a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,9 +139,9 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.3) - concurrent-ruby-ext (1.1.3) - concurrent-ruby (= 1.1.3) + concurrent-ruby (1.1.5) + concurrent-ruby-ext (1.1.5) + concurrent-ruby (= 1.1.5) connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) |