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~481
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/dd905b5aa893918168c644045aa1b6069e95d48e

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

dd905b5aa893918168c644045aa1b6069e95d48e
diff --cc Gemfile
index 7076b8c1f,8be817547..8f0d29d5a
--- a/Gemfile
+++ b/Gemfile
@@@ -45,9 -45,10 +45,9 @@@ 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 "composite_primary_keys", "~> 14.0.0"
  gem "config"
  gem "delayed_job_active_record"
  gem "frozen_record"