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~3078
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2b962023e39785a8388b5666974bdffba14f57d4?hp=c9b9f07ac7f1a1ebbb0ce0f0532cc4ee97639ad7

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

Bump bootstrap from 4.3.1 to 4.5.0
---

diff --git a/Gemfile b/Gemfile
index 35058f334..1cd0edca7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,7 @@ gem "image_optim_rails"
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "active_record_union"
 gem "activerecord-import"
-gem "bootstrap", "~> 4.3.1"
+gem "bootstrap", "~> 4.5.0"
 gem "cancancan"
 gem "composite_primary_keys", "~> 12.0.0"
 gem "config"
diff --git a/Gemfile.lock b/Gemfile.lock
index 388023cee..0fd5071c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -106,7 +106,7 @@ GEM
       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 @@ DEPENDENCIES
   bigdecimal (~> 1.1.0)
   binding_of_caller
   bootsnap (>= 1.4.2)
-  bootstrap (~> 4.3.1)
+  bootstrap (~> 4.5.0)
   browser
   bzip2-ffi
   cancancan