From: Tom Hughes <tom@compton.nu>
Date: Mon, 7 Sep 2020 06:09:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2818'
X-Git-Tag: live~3083
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/feb1412109845782e3363cad300a491c768f3dd5?hp=156d6cd2adff978294e2db4a2df789e6e1728eaa

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

diff --git a/Gemfile.lock b/Gemfile.lock
index b1903ceef..bbc6dcd47 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,7 +113,7 @@ GEM
     bootstrap_form (4.5.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
-    brakeman (4.9.0)
+    brakeman (4.9.1)
     browser (4.2.0)
     builder (3.2.4)
     bzip2-ffi (1.0.0)
@@ -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.8.0)
       rubocop (>= 0.87.0)
-    rubocop-rails (2.7.1)
+    rubocop-rails (2.8.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 0.87.0)