diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-01-28 11:34:15 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-01-28 11:34:15 +0000 |
| commit | 436a43346729745b3aeba214b27de937c65f062e (patch) | |
| tree | 854a658208b8729c905a36e1d16c26bc84baf0f0 | |
| parent | c8ef1ef07609d0fd744151fe3518e739c5a4b4b7 (diff) | |
| parent | f7e8a89421cf7305d6b255702d84ca774bc31ff2 (diff) | |
| download | gitlab-ce-436a43346729745b3aeba214b27de937c65f062e.tar.gz | |
Merge branch 'sh-bump-sidekiq-5.2.5' into 'master'
Bump Sidekiq to 5.2.5
See merge request gitlab-org/gitlab-ce!24662
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1c8222eb634..ec6af6ffb0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -627,7 +627,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.4) + rack-protection (2.0.5) rack rack-proxy (0.6.0) rack @@ -823,8 +823,9 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.2.3) + sidekiq (5.2.5) connection_pool (~> 2.2, >= 2.2.2) + rack (>= 1.5.0) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) sidekiq-cron (1.0.4) |