From: Tom Hughes <tom@compton.nu>
Date: Tue, 13 Oct 2020 07:14:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2881'
X-Git-Tag: live~2530
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/9b19a45e74abd4414bb79d6b992f7bec14390ad6?hp=-c

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

9b19a45e74abd4414bb79d6b992f7bec14390ad6
diff --combined Gemfile.lock
index f10a0a328,ac71e2d3f..67a70b8e4
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -383,13 -383,13 +383,13 @@@ GE
      rb-fsevent (0.10.4)
      rb-inotify (0.10.1)
        ffi (~> 1.0)
-     regexp_parser (1.8.1)
+     regexp_parser (1.8.2)
      request_store (1.5.0)
        rack (>= 1.4)
      rexml (3.2.4)
      rinku (2.0.6)
      rotp (6.2.0)
-     rubocop (0.93.0)
+     rubocop (0.93.1)
        parallel (~> 1.10)
        parser (>= 2.7.1.5)
        rainbow (>= 2.2.2, < 4.0)
@@@ -398,7 -398,7 +398,7 @@@
        rubocop-ast (>= 0.6.0)
        ruby-progressbar (~> 1.7)
        unicode-display_width (>= 1.4.0, < 2.0)
-     rubocop-ast (0.7.1)
+     rubocop-ast (0.8.0)
        parser (>= 2.7.1.5)
      rubocop-minitest (0.10.1)
        rubocop (>= 0.87)
@@@ -459,7 -459,7 +459,7 @@@
      validates_email_format_of (1.6.3)
        i18n
      vendorer (0.2.0)
 -    webmock (3.9.1)
 +    webmock (3.9.2)
        addressable (>= 2.3.6)
        crack (>= 0.3.2)
        hashdiff (>= 0.4.0, < 2.0.0)