From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Aug 2020 07:20:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2770'
X-Git-Tag: live~2995
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c3435167b9cfdae30fa98417972de0546ff3818b?ds=inline;hp=-c

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

c3435167b9cfdae30fa98417972de0546ff3818b
diff --combined Gemfile.lock
index 880d287ec,84891db37..236a0015a
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -2,7 -2,7 +2,7 @@@ GE
    remote: https://rubygems.org/
    specs:
      SystemTimer (1.2.3)
 -    aasm (5.1.0)
 +    aasm (5.1.1)
        concurrent-ruby (~> 1.0)
      actioncable (6.0.3.2)
        actionpack (= 6.0.3.2)
@@@ -83,7 -83,7 +83,7 @@@
      aws-sdk-kms (1.36.0)
        aws-sdk-core (~> 3, >= 3.99.0)
        aws-sigv4 (~> 1.1)
-     aws-sdk-s3 (1.77.0)
+     aws-sdk-s3 (1.78.0)
        aws-sdk-core (~> 3, >= 3.104.3)
        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.4.7)
 +    bootsnap (1.4.8)
        msgpack (~> 1.0)
      bootstrap (4.5.2)
        autoprefixer-rails (>= 9.1.0)