From: Tom Hughes <tom@compton.nu>
Date: Tue, 1 Dec 2020 08:18:53 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2986' into master
X-Git-Tag: live~3060
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1ff2ec6705dd337c3bcbe997a2852d660be97222?hp=78137c93b507c6515a1549ec52b8c022d479f6d9

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

diff --git a/Gemfile.lock b/Gemfile.lock
index a7d9fbf28..d5be32119 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.20.0)
+    parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     pg (1.2.3)
@@ -399,11 +399,11 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.1)
+    rubocop-ast (1.2.0)
       parser (>= 2.7.1.5)
     rubocop-minitest (0.10.1)
       rubocop (>= 0.87)
-    rubocop-performance (1.9.0)
+    rubocop-performance (1.9.1)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.8.1)