From: Tom Hughes <tom@compton.nu>
Date: Mon, 10 Aug 2020 17:11:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2765'
X-Git-Tag: live~2972
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/e1da786c9939dbc5c32ed9aab1eb62413b643938?ds=sidebyside;hp=-c

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

e1da786c9939dbc5c32ed9aab1eb62413b643938
diff --combined Gemfile.lock
index 811fe94b8,f66fc279f..1f39ded38
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -74,7 -74,7 +74,7 @@@ GE
      autoprefixer-rails (9.8.6.1)
        execjs
      aws-eventstream (1.1.0)
 -    aws-partitions (1.352.0)
 +    aws-partitions (1.353.0)
      aws-sdk-core (3.104.3)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
@@@ -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.75.0)
 +    aws-sdk-s3 (1.76.0)
        aws-sdk-core (~> 3, >= 3.104.1)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
@@@ -106,7 -106,7 +106,7 @@@
        debug_inspector (>= 0.0.1)
      bootsnap (1.4.7)
        msgpack (~> 1.0)
-     bootstrap (4.5.0)
+     bootstrap (4.5.2)
        autoprefixer-rails (>= 9.1.0)
        popper_js (>= 1.14.3, < 2)
        sassc-rails (>= 2.0.0)
@@@ -133,7 -133,7 +133,7 @@@
      coderay (1.1.3)
      composite_primary_keys (12.0.2)
        activerecord (~> 6.0.0)
-     concurrent-ruby (1.1.6)
+     concurrent-ruby (1.1.7)
      config (2.2.1)
        deep_merge (~> 1.2, >= 1.2.1)
        dry-validation (~> 1.0, >= 1.0.0)