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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index e5cb4173fcdef7d84309084af0eb385727c454ab..8f0d29d5a9df16c0001dbf80b8320747fe33d00b 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -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"
@@ -114,7 +113,7 @@ gem "kgio"
 gem "secure_headers"
 
 # Load canonical-rails to generate canonical URLs
-gem "canonical-rails", :github => "tomhughes/canonical-rails", :branch => "rails71"
+gem "canonical-rails"
 
 # Used to generate logstash friendly log files
 gem "logstasher"