Commit 436a4334 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'sh-bump-sidekiq-5.2.5' into 'master'

Bump Sidekiq to 5.2.5

See merge request gitlab-org/gitlab-ce!24662
parents c8ef1ef0 f7e8a894
...@@ -627,7 +627,7 @@ GEM ...@@ -627,7 +627,7 @@ GEM
httpclient (>= 2.4) httpclient (>= 2.4)
multi_json (>= 1.3.6) multi_json (>= 1.3.6)
rack (>= 1.1) rack (>= 1.1)
rack-protection (2.0.4) rack-protection (2.0.5)
rack rack
rack-proxy (0.6.0) rack-proxy (0.6.0)
rack rack
...@@ -823,8 +823,9 @@ GEM ...@@ -823,8 +823,9 @@ GEM
rack rack
shoulda-matchers (3.1.2) shoulda-matchers (3.1.2)
activesupport (>= 4.0.0) activesupport (>= 4.0.0)
sidekiq (5.2.3) sidekiq (5.2.5)
connection_pool (~> 2.2, >= 2.2.2) connection_pool (~> 2.2, >= 2.2.2)
rack (>= 1.5.0)
rack-protection (>= 1.5.0) rack-protection (>= 1.5.0)
redis (>= 3.3.5, < 5) redis (>= 3.3.5, < 5)
sidekiq-cron (1.0.4) sidekiq-cron (1.0.4)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment