From: Tom Hughes <tom@compton.nu>
Date: Tue, 17 Nov 2020 08:14:44 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2967' into master
X-Git-Tag: live~1859
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8d2fbc63a4319e424d23ac71f6372415ccf0a7b2?hp=835a1f9fcb8f5e54db98a12a2db7759a7ec0c755

Merge remote-tracking branch 'upstream/pull/2967' into master
---

diff --git a/Gemfile.lock b/Gemfile.lock
index b0a16c255..71317a646 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -325,7 +325,7 @@ GEM
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)
-    parallel (1.19.2)
+    parallel (1.20.0)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     pg (1.2.3)
@@ -399,12 +399,12 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.8.0)
+    rubocop-ast (1.1.1)
       parser (>= 2.7.1.5)
     rubocop-minitest (0.10.1)
       rubocop (>= 0.87)
-    rubocop-performance (1.8.1)
-      rubocop (>= 0.87.0)
+    rubocop-performance (1.9.0)
+      rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.8.1)
       activesupport (>= 4.2.0)