From: Tom Hughes <tom@compton.nu>
Date: Tue, 27 Oct 2020 08:10:25 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2911' into master
X-Git-Tag: live~2919
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1be2439b19bcc02bf9dbab9dcc8810003cf84e83?hp=18fe77ff18c1b3862852d1913d2534039bc915cb

Merge remote-tracking branch 'upstream/pull/2911' into master
---

diff --git a/Gemfile.lock b/Gemfile.lock
index 18ee99c2b..9bb897a93 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -333,7 +333,7 @@ GEM
     progress (3.5.2)
     psych (3.2.0)
     public_suffix (4.0.6)
-    puma (5.0.2)
+    puma (5.0.3)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     r2 (0.2.7)