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

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

ee8c6bfe3a197c0d6c7140d346257b00feafd3c9
diff --combined Gemfile.lock
index 97e9f83b8,4f7e20d63..a66c399d2
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -74,8 -74,8 +74,8 @@@ GE
      autoprefixer-rails (10.0.1.3)
        execjs
      aws-eventstream (1.1.0)
 -    aws-partitions (1.383.0)
 -    aws-sdk-core (3.109.1)
 +    aws-partitions (1.390.0)
 +    aws-sdk-core (3.109.2)
        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.39.0)
        aws-sdk-core (~> 3, >= 3.109.0)
        aws-sigv4 (~> 1.1)
 -    aws-sdk-s3 (1.83.1)
 +    aws-sdk-s3 (1.83.2)
        aws-sdk-core (~> 3, >= 3.109.0)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
@@@ -106,7 -106,7 +106,7 @@@
        debug_inspector (>= 0.0.1)
      bootsnap (1.5.0)
        msgpack (~> 1.0)
 -    bootstrap (4.5.2)
 +    bootstrap (4.5.3)
        autoprefixer-rails (>= 9.1.0)
        popper_js (>= 1.14.3, < 2)
        sassc-rails (>= 2.0.0)
@@@ -272,7 -272,7 +272,7 @@@
      maxminddb (0.1.22)
      method_source (1.0.0)
      mimemagic (0.3.5)
-     mini_magick (4.10.1)
+     mini_magick (4.11.0)
      mini_mime (1.0.2)
      mini_portile2 (2.4.0)
      minitest (5.14.2)
@@@ -453,7 -453,7 +453,7 @@@
      tilt (2.0.10)
      tins (1.25.0)
        sync
 -    tzinfo (1.2.7)
 +    tzinfo (1.2.8)
        thread_safe (~> 0.1)
      uglifier (4.2.0)
        execjs (>= 0.3.0, < 3)
@@@ -470,7 -470,7 +470,7 @@@
      websocket-extensions (0.1.5)
      xpath (3.2.0)
        nokogiri (~> 1.8)
 -    zeitwerk (2.4.0)
 +    zeitwerk (2.4.1)
  
  PLATFORMS
    ruby