Localisation updates from https://translatewiki.net.

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index e5cb4173fcdef7d84309084af0eb385727c454ab..f9f12d64e9b31de332cc38b5e04aea420249eaf5 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 "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", "~> 5.3.2"

 gem "bootstrap_form", "~> 5.0"
 gem "cancancan"
 gem "bootstrap_form", "~> 5.0"
 gem "cancancan"

-# gem "composite_primary_keys", "~> 14.0.0"

 gem "config"
 gem "delayed_job_active_record"
 gem "frozen_record"
 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 "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"
 
 # Used to generate logstash friendly log files
 gem "logstasher"