From: Tom Hughes <tom@compton.nu>
Date: Mon, 7 Sep 2020 06:08:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2817'
X-Git-Tag: live~3000
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f76b1df31bfa83d5cd4ddb1deb1e06b48e370646?hp=df6b048043e4187f8f9fe21ab6a7955e1a5da33e

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

diff --git a/Gemfile.lock b/Gemfile.lock
index f0c73d888..309992f75 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -333,7 +333,7 @@ GEM
     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 @@ GEM
       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)