From 45a05a8ba33101ffcd154ee84307885b48b17962 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 28 Nov 2019 06:06:25 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 Gemfile.lock | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'Gemfile.lock')

diff --git a/Gemfile.lock b/Gemfile.lock
index ba40ebc6cb5..0f9b78cd8e9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -749,10 +749,11 @@ GEM
     pry-rails (0.3.6)
       pry (>= 0.10.4)
     public_suffix (3.1.1)
-    puma (3.12.0)
-    puma_worker_killer (0.1.0)
+    puma (4.3.0)
+      nio4r (~> 2.0)
+    puma_worker_killer (0.1.1)
       get_process_mem (~> 0.2)
-      puma (>= 2.7, < 4)
+      puma (>= 2.7, < 5)
     pyu-ruby-sasl (0.0.3.3)
     raabro (1.1.6)
     rack (2.0.7)
@@ -1280,8 +1281,8 @@ DEPENDENCIES
   prometheus-client-mmap (~> 0.9.10)
   pry-byebug (~> 3.5.1)
   pry-rails (~> 0.3.4)
-  puma (~> 3.12)
-  puma_worker_killer
+  puma (~> 4.3.0)
+  puma_worker_killer (~> 0.1.1)
   rack (~> 2.0.7)
   rack-attack (~> 6.2.0)
   rack-cors (~> 1.0.0)
-- 
cgit v1.2.1