Upgrade to bootstrap 5

diff --git a/Gemfile b/Gemfile
index eee7dc69d2ff936f1df4f12abec2e09258602b6d..9f4f745ff77b0840706f6fa6ea9d46195550ee7f 100644 (file)
--- 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 "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"
 gem "cancancan"
 gem "composite_primary_keys", "~> 14.0.0"
 gem "config"

diff --git a/Gemfile.lock b/Gemfile.lock
index b167a40538c12c6a4aa3dbca2cb5f04525778df7..8de7861560a22e4725806922723249c088101183 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,11 +117,11 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.12.0)
       msgpack (~> 1.2)
       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)
       autoprefixer-rails (>= 9.1.0)

-      popper_js (>= 1.14.3, < 2)
+      popper_js (>= 2.9.3, < 3)

       sassc-rails (>= 2.0.0)
       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)
       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)
     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)
     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)
   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
   brakeman
   browser
   bzip2-ffi