From: Andy Allan <git@gravitystorm.co.uk>
Date: Sat, 4 Jul 2020 08:12:18 +0000 (+0200)
Subject: Merge pull request #2674 from openstreetmap/dependabot/bundler/bootstrap-4.5.0
X-Git-Tag: live~3035
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2b962023e39785a8388b5666974bdffba14f57d4?hp=-c

Merge pull request #2674 from openstreetmap/dependabot/bundler/bootstrap-4.5.0

Bump bootstrap from 4.3.1 to 4.5.0
---

2b962023e39785a8388b5666974bdffba14f57d4
diff --combined Gemfile.lock
index 388023cee,b8acee29f..0fd5071c2
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -74,16 -74,16 +74,16 @@@ GE
      autoprefixer-rails (9.8.4)
        execjs
      aws-eventstream (1.1.0)
 -    aws-partitions (1.336.0)
 -    aws-sdk-core (3.102.1)
 +    aws-partitions (1.338.0)
 +    aws-sdk-core (3.103.0)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
        aws-sigv4 (~> 1.1)
        jmespath (~> 1.0)
 -    aws-sdk-kms (1.35.0)
 +    aws-sdk-kms (1.36.0)
        aws-sdk-core (~> 3, >= 3.99.0)
        aws-sigv4 (~> 1.1)
 -    aws-sdk-s3 (1.72.0)
 +    aws-sdk-s3 (1.73.0)
        aws-sdk-core (~> 3, >= 3.102.1)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
@@@ -106,7 -106,7 +106,7 @@@
        debug_inspector (>= 0.0.1)
      bootsnap (1.4.6)
        msgpack (~> 1.0)
-     bootstrap (4.3.1)
+     bootstrap (4.5.0)
        autoprefixer-rails (>= 9.1.0)
        popper_js (>= 1.14.3, < 2)
        sassc-rails (>= 2.0.0)
@@@ -483,7 -483,7 +483,7 @@@ DEPENDENCIE
    bigdecimal (~> 1.1.0)
    binding_of_caller
    bootsnap (>= 1.4.2)
-   bootstrap (~> 4.3.1)
+   bootstrap (~> 4.5.0)
    browser
    bzip2-ffi
    cancancan