From: Tom Hughes <tom@compton.nu>
Date: Tue, 18 May 2021 07:26:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3199'
X-Git-Tag: live~1681
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/edb95acedc1f39a826352ec204cd15053360edc0?hp=be9a9a15569c5ab9fe49dcc47e0cb7b3a592a7d6

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

diff --git a/Gemfile b/Gemfile
index fd1df513c..10e34638e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -136,7 +136,7 @@ group :test do
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"
-  gem "puma", "~> 5.0"
+  gem "puma", "~> 5.3"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"
diff --git a/Gemfile.lock b/Gemfile.lock
index af52b2d01..c01eeb372 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -335,7 +335,7 @@ GEM
     popper_js (1.16.0)
     progress (3.6.0)
     public_suffix (4.0.6)
-    puma (5.3.0)
+    puma (5.3.1)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     r2 (0.2.7)
@@ -536,7 +536,7 @@ DEPENDENCIES
   omniauth-windowslive
   openstreetmap-deadlock_retry (>= 1.3.1)
   pg
-  puma (~> 5.0)
+  puma (~> 5.3)
   quad_tile (~> 1.0.1)
   r2 (~> 0.2.7)
   rack-cors