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

Bump Sidekiq to 5.2.5 See merge request gitlab-org/gitlab-ce!24662

Merge branch 'sh-bump-sidekiq-5.2.5' into 'master'
Bump Sidekiq to 5.2.5 See merge request gitlab-org/gitlab-ce!24662
436a4334 · Rémy Coutable · c8ef1ef0 · f7e8a894 · 436a4334
Commit 436a4334 authored Jan 28, 2019 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Gemfile.lock Gemfile.lock +3 -2

No files found.
--- 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)