From: Tom Hughes <tom@compton.nu>
Date: Tue, 24 Oct 2023 16:37:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4262'
X-Git-Tag: live~1735
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/dd905b5aa893918168c644045aa1b6069e95d48e?hp=847119415ce727970c4f1870993845675eac4b53

Merge remote-tracking branch 'upstream/pull/4262'
---

diff --git a/Gemfile b/Gemfile
index 7076b8c1f..8f0d29d5a 100644
--- 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 => "gravitystorm/bootstrap-rubygem", :branch => "dartsass_5_2_3"
+gem "bootstrap", :github => "twbs/bootstrap-rubygem", :ref => "fde1edff90d9219bbef48ecc6a65f13835269bcd"
 gem "bootstrap_form", "~> 5.0"
 gem "cancancan"
 gem "config"
diff --git a/Gemfile.lock b/Gemfile.lock
index 1a96a9e96..80f7b2936 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,11 @@
 GIT
-  remote: https://github.com/gravitystorm/bootstrap-rubygem.git
-  revision: 7bd2caa8a2897a55892915a789d4e020906adb60
-  branch: dartsass_5_2_3
+  remote: https://github.com/twbs/bootstrap-rubygem.git
+  revision: fde1edff90d9219bbef48ecc6a65f13835269bcd
+  ref: fde1edff90d9219bbef48ecc6a65f13835269bcd
   specs:
-    bootstrap (5.2.3)
+    bootstrap (5.3.1)
       autoprefixer-rails (>= 9.1.0)
-      popper_js (>= 2.11.6, < 3)
+      popper_js (>= 2.11.8, < 3)
 
 GEM
   remote: https://rubygems.org/