summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-01-24 21:53:14 -0800
committerStan Hu <stanhu@gmail.com>2019-01-25 23:00:20 -0800
commitf7e8a89421cf7305d6b255702d84ca774bc31ff2 (patch)
tree70a7d1a6273ae6435c5807283844d33618126f42
parentc2b3f64cb44114e69ddeeb453412ad4dd762baf9 (diff)
downloadgitlab-ce-f7e8a89421cf7305d6b255702d84ca774bc31ff2.tar.gz
Bump Sidekiq to 5.2.5
This reduces duplication caused by gitlab-monitor already shipping Sidekiq 5.2.5. The only changes appear to be minor: https://github.com/mperham/sidekiq/blob/master/Changes.md
-rw-r--r--Gemfile.lock5
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)