From: Tom Hughes <tom@compton.nu>
Date: Wed, 24 Mar 2021 15:32:13 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3148'
X-Git-Tag: live~1762
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a512392e6cf5706c3c8b8897570025de6ba6d33c?hp=3512d6303c438ceaab5e74bcc43b165a55a2aa20

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

diff --git a/Gemfile.lock b/Gemfile.lock
index fb9a9635b..ae451798e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -260,7 +260,7 @@ GEM
       mimemagic (~> 0.3.2)
     maxminddb (0.1.22)
     method_source (1.0.0)
-    mimemagic (0.3.5)
+    mimemagic (0.3.6)
     mini_magick (4.11.0)
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
@@ -387,7 +387,7 @@ GEM
     rexml (3.2.4)
     rinku (2.0.6)
     rotp (6.2.0)
-    rubocop (1.11.0)
+    rubocop (1.12.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -553,4 +553,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.1.4
+   2.2.8