From: Tom Hughes <tom@compton.nu>
Date: Wed, 11 Nov 2020 08:21:49 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2953' into master
X-Git-Tag: live~3183
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b1d8d735250bb235ef2da40cfffe9ca345476dcf?hp=e541f2b8b4e99ebb453dc0d5ef180881bb368447

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 3e424ddc1..72ad92f5a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,7 +83,7 @@ GEM
     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 @@ GEM
     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)