summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-05-31 23:27:10 -0700
committerStan Hu <stanhu@gmail.com>2019-06-01 22:27:55 -0700
commitfe0c53805d53a0276a31f0c5d754a6602d55bed6 (patch)
tree4f6a6a6f62fcaa59ff8be55c3d6b8498a718d643
parent2ad5b30b6c02a3e3f84275121a709f5de75dac48 (diff)
downloadgitlab-ce-fe0c53805d53a0276a31f0c5d754a6602d55bed6.tar.gz
Bump concurrent-ruby and concurrent-ruby-ext to 1.1.5sh-bump-ruby-concurrency-gem
This matches the version used in Gitaly and avoids potential version conflicts when multiple versions are installed.
-rw-r--r--Gemfile.lock6
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)