From: Tom Hughes <tom@compton.nu>
Date: Thu, 24 Sep 2020 10:40:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2848'
X-Git-Tag: live~2981
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a02a7839046bc10b232080916d545936432e65a3?hp=b45b103b948cfaf2665b76d2bfb187b2e2613f76

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 68de1f478..fae8b8594 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -390,7 +390,7 @@ GEM
     rexml (3.2.4)
     rinku (2.0.6)
     rotp (6.1.0)
-    rubocop (0.91.0)
+    rubocop (0.91.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)