From: Tom Hughes <tom@compton.nu>
Date: Tue, 10 Nov 2020 09:39:49 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2950' into master
X-Git-Tag: live~1962
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e99692fae85066fbfcc1bae99ebb29974104e3bc?hp=-c

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

e99692fae85066fbfcc1bae99ebb29974104e3bc
diff --combined Gemfile.lock
index 77aa0e4d7,20088beee..1d868a95b
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -83,7 -83,7 +83,7 @@@ GE
      aws-sdk-kms (1.39.0)
        aws-sdk-core (~> 3, >= 3.109.0)
        aws-sigv4 (~> 1.1)
 -    aws-sdk-s3 (1.83.2)
 +    aws-sdk-s3 (1.84.0)
        aws-sdk-core (~> 3, >= 3.109.0)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
@@@ -254,7 -254,7 +254,7 @@@
      kramdown (2.3.0)
        rexml
      libxml-ruby (3.2.1)
 -    listen (3.2.1)
 +    listen (3.3.0)
        rb-fsevent (~> 0.10, >= 0.10.3)
        rb-inotify (~> 0.9, >= 0.9.10)
      logstash-event (1.2.02)
@@@ -461,7 -461,7 +461,7 @@@
      validates_email_format_of (1.6.3)
        i18n
      vendorer (0.2.0)
-     webmock (3.9.4)
+     webmock (3.9.5)
        addressable (>= 2.3.6)
        crack (>= 0.3.2)
        hashdiff (>= 0.4.0, < 2.0.0)