From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Sep 2020 07:24:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2831'
X-Git-Tag: live~2922
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/22bef56525bf677e3a6c2257d63d7e4ce32a00d5?hp=86d08c396763a231e16c7fd5ff480cfd11ccfc52

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

diff --git a/Gemfile.lock b/Gemfile.lock
index a72428d7d..9af09cc96 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -399,13 +399,13 @@ GEM
       rubocop-ast (>= 0.3.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
+    rubocop-ast (0.4.0)
       parser (>= 2.7.1.4)
     rubocop-minitest (0.10.1)
       rubocop (>= 0.87)
     rubocop-performance (1.8.0)
       rubocop (>= 0.87.0)
-    rubocop-rails (2.8.0)
+    rubocop-rails (2.8.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 0.87.0)