Switch back to bootstrap releases

Bootstrap-rubygem 5.3.2 onwards allows us to use dartsass-sprockets.

Refs #4262

diff --git a/Gemfile b/Gemfile
index 8f0d29d5a9df16c0001dbf80b8320747fe33d00b..f9f12d64e9b31de332cc38b5e04aea420249eaf5 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -45,7 +45,7 @@ gem "sprockets-exporters_pack"
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
 gem "active_record_union"
-gem "bootstrap", :github => "twbs/bootstrap-rubygem", :ref => "fde1edff90d9219bbef48ecc6a65f13835269bcd"
+gem "bootstrap", "~> 5.3.2"
 gem "bootstrap_form", "~> 5.0"
 gem "cancancan"
 gem "config"

diff --git a/Gemfile.lock b/Gemfile.lock
index 80f7b2936b559e3763e2d2d457a3cceb822b66a3..3202c907d802a7b63be9569e488bce7f19ff188d 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,3 @@
-GIT
-  remote: https://github.com/twbs/bootstrap-rubygem.git
-  revision: fde1edff90d9219bbef48ecc6a65f13835269bcd
-  ref: fde1edff90d9219bbef48ecc6a65f13835269bcd
-  specs:
-    bootstrap (5.3.1)
-      autoprefixer-rails (>= 9.1.0)
-      popper_js (>= 2.11.8, < 3)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -135,6 +126,9 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
+    bootstrap (5.3.2)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 2.11.8, < 3)
     bootstrap_form (5.3.2)
       actionpack (>= 6.1)
       activemodel (>= 6.1)
@@ -590,7 +584,7 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   bootsnap (>= 1.4.2)
-  bootstrap!
+  bootstrap (~> 5.3.2)
   bootstrap_form (~> 5.0)
   brakeman
   browser