From: Tom Hughes <tom@compton.nu>
Date: Mon, 21 Sep 2020 15:35:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2846'
X-Git-Tag: live~3275
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ab31e016a348a13afa289b3a1c3acc4e4acfd8c4?hp=205d537ea2f906e30269cbb7e5a6fd5c1990e59b

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

diff --git a/Gemfile.lock b/Gemfile.lock
index e28a21f8a..e0bd6b89b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -384,7 +384,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (1.7.1)
+    regexp_parser (1.8.0)
     request_store (1.5.0)
       rack (>= 1.4)
     rexml (3.2.4)
@@ -399,12 +399,13 @@ GEM
       rubocop-ast (>= 0.4.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.4.0)
+    rubocop-ast (0.4.2)
       parser (>= 2.7.1.4)
     rubocop-minitest (0.10.1)
       rubocop (>= 0.87)
-    rubocop-performance (1.8.0)
+    rubocop-performance (1.8.1)
       rubocop (>= 0.87.0)
+      rubocop-ast (>= 0.4.0)
     rubocop-rails (2.8.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)