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

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

1e03bd31032f80e3bd05253e160614b2b16b647b
diff --combined Gemfile.lock
index 30945b73a,fbde32df6..77aa0e4d7
--- 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)