From: Tom Hughes <tom@compton.nu>
Date: Sun, 28 Jun 2020 17:42:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2676'
X-Git-Tag: live~3187
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/45c599b1b009d67a2b4f1778beeabc9ef762a4dc?hp=1212fbad4ce1b087a8eaad8ee08698e7028cf930

Merge remote-tracking branch 'upstream/pull/2676'
---

diff --git a/Gemfile b/Gemfile
index c16d36497..35058f334 100644
--- a/Gemfile
+++ b/Gemfile
@@ -143,7 +143,7 @@ group :test do
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"
-  gem "puma", "~> 3.11"
+  gem "puma", "~> 4.3"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"
diff --git a/Gemfile.lock b/Gemfile.lock
index ba8287805..d0155bcd0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -328,7 +328,8 @@ GEM
     progress (3.5.2)
     psych (3.1.0)
     public_suffix (4.0.5)
-    puma (3.12.6)
+    puma (4.3.5)
+      nio4r (~> 2.0)
     quad_tile (1.0.1)
     r2 (0.2.7)
     rack (2.2.3)
@@ -526,7 +527,7 @@ DEPENDENCIES
   openstreetmap-deadlock_retry (>= 1.3.0)
   pg
   psych
-  puma (~> 3.11)
+  puma (~> 4.3)
   quad_tile (~> 1.0.1)
   r2 (~> 0.2.7)
   rack-cors