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~2516
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/feb1412109845782e3363cad300a491c768f3dd5

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

feb1412109845782e3363cad300a491c768f3dd5
diff --cc Gemfile.lock
index 309992f75,b1903ceef..bbc6dcd47
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -403,9 -403,9 +403,9 @@@ GE
        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)