From: Tom Hughes <tom@compton.nu>
Date: Thu, 6 Aug 2020 17:14:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2754'
X-Git-Tag: live~3393
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a2491c718b8706a055309aaae5fea4b66519bfd1?hp=4d2ea315168b8cdbb6b00e0c9bf3d9da30566f5f

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 3b3ffaf06..0024394b7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -389,17 +389,17 @@ GEM
     rexml (3.2.4)
     rinku (2.0.6)
     rotp (6.1.0)
-    rubocop (0.86.0)
+    rubocop (0.89.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.0.3, < 1.0)
+      rubocop-ast (>= 0.1.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.2.0)
-      parser (>= 2.7.0.1)
+    rubocop-ast (0.3.0)
+      parser (>= 2.7.1.4)
     rubocop-minitest (0.9.0)
       rubocop (>= 0.74)
     rubocop-performance (1.7.1)