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~2974
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/feb1412109845782e3363cad300a491c768f3dd5?ds=inline;hp=-c

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

feb1412109845782e3363cad300a491c768f3dd5
diff --combined Gemfile.lock
index 309992f75,b1903ceef..bbc6dcd47
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -113,7 -113,7 +113,7 @@@ GE
      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 +333,7 @@@
      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)
@@@ -403,9 -403,9 +403,9 @@@
        parser (>= 2.7.1.4)
      rubocop-minitest (0.10.1)
        rubocop (>= 0.87)
-     rubocop-performance (1.7.1)
-       rubocop (>= 0.82.0)
+     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)