From: Tom Hughes <tom@compton.nu>
Date: Wed, 11 Nov 2020 08:21:47 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2952' into master
X-Git-Tag: live~2662
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/953aa7fd4d564373d34ae794f8a96e1c70802823?ds=sidebyside;hp=-c

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

953aa7fd4d564373d34ae794f8a96e1c70802823
diff --combined Gemfile.lock
index 70d88a63b,bc198994a..424f4a4eb
--- 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.84.0)
 +    aws-sdk-s3 (1.84.1)
        aws-sdk-core (~> 3, >= 3.109.0)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
@@@ -104,7 -104,7 +104,7 @@@
      bigdecimal (1.1.0)
      binding_of_caller (0.8.0)
        debug_inspector (>= 0.0.1)
-     bootsnap (1.5.0)
+     bootsnap (1.5.1)
        msgpack (~> 1.0)
      bootstrap (4.5.3)
        autoprefixer-rails (>= 9.1.0)