From: Tom Hughes <tom@compton.nu>
Date: Mon, 28 Sep 2020 07:46:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2855'
X-Git-Tag: live~2942
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/dc9f90c7b3af30a40b740428ee39a13756f64c43?ds=sidebyside;hp=-c

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

dc9f90c7b3af30a40b740428ee39a13756f64c43
diff --combined Gemfile.lock
index 399e39793,dbe04230b..7dd7d5402
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -74,8 -74,8 +74,8 @@@ GE
      autoprefixer-rails (10.0.0.2)
        execjs
      aws-eventstream (1.1.0)
-     aws-partitions (1.370.0)
-     aws-sdk-core (3.107.0)
+     aws-partitions (1.376.0)
+     aws-sdk-core (3.108.0)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
        aws-sigv4 (~> 1.1)
@@@ -83,7 -83,7 +83,7 @@@
      aws-sdk-kms (1.38.0)
        aws-sdk-core (~> 3, >= 3.99.0)
        aws-sigv4 (~> 1.1)
-     aws-sdk-s3 (1.81.0)
+     aws-sdk-s3 (1.81.1)
        aws-sdk-core (~> 3, >= 3.104.3)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
@@@ -146,7 -146,7 +146,7 @@@
      crack (0.4.3)
        safe_yaml (~> 1.0.0)
      crass (1.0.6)
 -    dalli (2.7.10)
 +    dalli (2.7.11)
      debug_inspector (0.0.3)
      deep_merge (1.2.1)
      delayed_job (4.1.8)