From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 11 May 2022 13:07:09 +0000 (+0100)
Subject: Upgrade to bootstrap 5
X-Git-Tag: live~2276^2~17
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a481915a3773b92b4464bb70fdc0544667611751

Upgrade to bootstrap 5
---

diff --git a/Gemfile b/Gemfile
index eee7dc69d..9f4f745ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,8 +40,8 @@ gem "argon2"
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
 gem "active_record_union"
-gem "bootstrap", "~> 4.5.0"
-gem "bootstrap_form", "~> 4.0"
+gem "bootstrap", "~> 5.1.0"
+gem "bootstrap_form", "~> 5.0"
 gem "cancancan"
 gem "composite_primary_keys", "~> 14.0.0"
 gem "config"
diff --git a/Gemfile.lock b/Gemfile.lock
index b167a4053..8de786156 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,11 +117,11 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.12.0)
       msgpack (~> 1.2)
-    bootstrap (4.5.3)
+    bootstrap (5.1.3)
       autoprefixer-rails (>= 9.1.0)
-      popper_js (>= 1.14.3, < 2)
+      popper_js (>= 2.9.3, < 3)
       sassc-rails (>= 2.0.0)
-    bootstrap_form (4.5.0)
+    bootstrap_form (5.1.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
     brakeman (5.2.3)
@@ -356,7 +356,7 @@ GEM
     parser (3.1.2.0)
       ast (~> 2.4.1)
     pg (1.4.1)
-    popper_js (1.16.0)
+    popper_js (2.9.3)
     progress (3.6.0)
     public_suffix (4.0.7)
     puma (5.6.4)
@@ -521,8 +521,8 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   bootsnap (>= 1.4.2)
-  bootstrap (~> 4.5.0)
-  bootstrap_form (~> 4.0)
+  bootstrap (~> 5.1.0)
+  bootstrap_form (~> 5.0)
   brakeman
   browser
   bzip2-ffi