Automatic merge of gitlab-org/gitlab-ce master

dcaaacb0 · GitLab Bot · 0752dd48 · 436a4334 · dcaaacb0
Commit dcaaacb0 authored Jan 28, 2019 by GitLab Bot
Show 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
@@ -657,7 +657,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
@@ -853,8 +853,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)