From: Tom Hughes <tom@compton.nu>
Date: Fri, 6 Nov 2020 08:17:13 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2939' into master
X-Git-Tag: live~2450
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/5dcb0737da48706fde539da00b8c6259d0aee136?ds=inline;hp=-c

Merge remote-tracking branch 'upstream/pull/2939' into master
---

5dcb0737da48706fde539da00b8c6259d0aee136
diff --combined Gemfile.lock
index 2a1e431a3,d832cf2ae..e1ab9112b
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -89,7 -89,7 +89,7 @@@ GE
        aws-sigv4 (~> 1.1)
      aws-sigv4 (1.2.2)
        aws-eventstream (~> 1, >= 1.0.2)
 -    better_errors (2.9.0)
 +    better_errors (2.9.1)
        coderay (>= 1.0.0)
        erubi (>= 1.0.0)
        rack (>= 0.9.0)
@@@ -253,7 -253,7 +253,7 @@@
      kgio (2.11.3)
      kramdown (2.3.0)
        rexml
 -    libxml-ruby (3.2.0)
 +    libxml-ruby (3.2.1)
      listen (3.2.1)
        rb-fsevent (~> 0.10, >= 0.10.3)
        rb-inotify (~> 0.9, >= 0.9.10)
@@@ -461,7 -461,7 +461,7 @@@
      validates_email_format_of (1.6.3)
        i18n
      vendorer (0.2.0)
-     webmock (3.9.3)
+     webmock (3.9.4)
        addressable (>= 2.3.6)
        crack (>= 0.3.2)
        hashdiff (>= 0.4.0, < 2.0.0)