From: Tom Hughes <tom@compton.nu>
Date: Mon, 7 Sep 2020 06:08:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2816'
X-Git-Tag: live~2976
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/775a8cf4b388a5f5406a94d94102e2ea2d2b2e00?ds=inline;hp=-c

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

775a8cf4b388a5f5406a94d94102e2ea2d2b2e00
diff --combined Gemfile.lock
index 9d063dc88,7c05b90fb..47ebfe4c8
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -333,7 -333,7 +333,7 @@@ GE
      progress (3.5.2)
      psych (3.2.0)
      public_suffix (4.0.5)
-     puma (4.3.5)
+     puma (4.3.6)
        nio4r (~> 2.0)
      quad_tile (1.0.1)
      r2 (0.2.7)
@@@ -405,7 -405,7 +405,7 @@@
        rubocop (>= 0.87)
      rubocop-performance (1.7.1)
        rubocop (>= 0.82.0)
 -    rubocop-rails (2.7.1)
 +    rubocop-rails (2.8.0)
        activesupport (>= 4.2.0)
        rack (>= 1.1)
        rubocop (>= 0.87.0)