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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 1e20da8d64cd59740d7f54e834b88db50c04834c..60a8fcaceae8671347e148a61b2a756f1ca62f33 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -55,6 +55,7 @@ gem "bootstrap_form", "~> 5.0"
 gem "cancancan"
 gem "config"
 gem "delayed_job_active_record"
+gem "dry-schema", "< 1.14.0" # see https://github.com/openstreetmap/openstreetmap-website/issues/5482
 gem "dry-validation"
 gem "frozen_record"
 gem "http_accept_language", "~> 2.1.1"
@@ -118,8 +119,7 @@ gem "dalli"
 gem "kgio"
 
 # Load canonical-rails to generate canonical URLs
-# Use unreleased version for rails 7.2.1+ compatibility
-gem "canonical-rails", :github => "jumph4x/canonical-rails", :ref => "fbc1c88c"
+gem "canonical-rails"
 
 # Used to generate logstash friendly log files
 gem "logstasher"