From: Tom Hughes <tom@compton.nu>
Date: Wed, 2 Sep 2020 06:18:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2805'
X-Git-Tag: live~2083
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f249245135c8ed85562a89923da19564e644a32d?hp=-c

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

f249245135c8ed85562a89923da19564e644a32d
diff --combined Gemfile.lock
index bf4c59404,a0413e0fc..339f336d0
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -275,7 -275,7 +275,7 @@@ GE
      mini_magick (4.10.1)
      mini_mime (1.0.2)
      mini_portile2 (2.4.0)
-     minitest (5.14.1)
+     minitest (5.14.2)
      msgpack (1.3.3)
      multi_json (1.15.0)
      multi_xml (0.6.0)
@@@ -390,7 -390,7 +390,7 @@@
      rexml (3.2.4)
      rinku (2.0.6)
      rotp (6.1.0)
 -    rubocop (0.89.1)
 +    rubocop (0.90.0)
        parallel (~> 1.10)
        parser (>= 2.7.1.1)
        rainbow (>= 2.2.2, < 4.0)