From: Tom Hughes <tom@compton.nu>
Date: Mon, 20 Jul 2020 10:46:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2718'
X-Git-Tag: live~3454
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/af26c9fe606eba5ca4b3346cc26cb965890feb60?hp=7986576b0ebe2567b494256c9cf6e88b6c9d6338

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 89263a417..cc8dcaefb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -395,11 +395,11 @@ GEM
       rubocop-ast (>= 0.0.3, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.1.0)
+    rubocop-ast (0.2.0)
       parser (>= 2.7.0.1)
     rubocop-minitest (0.9.0)
       rubocop (>= 0.74)
-    rubocop-performance (1.7.0)
+    rubocop-performance (1.7.1)
       rubocop (>= 0.82.0)
     rubocop-rails (2.6.0)
       activesupport (>= 4.2.0)