From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 2 Oct 2024 16:15:54 +0000 (+0100)
Subject: Switch to canonical-rails from master, with rails 7.2.1+ compatibility
X-Git-Tag: live~70^2~1
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/1633059dbbc61bfe04ef7d39709e3e7a84687043?hp=57209683238197d4391103ba3ca4b295a70fbb0a

Switch to canonical-rails from master, with rails 7.2.1+ compatibility
---

diff --git a/Gemfile b/Gemfile
index b25255320..26bc7c129 100644
--- a/Gemfile
+++ b/Gemfile
@@ -118,7 +118,8 @@ gem "dalli"
 gem "kgio"
 
 # Load canonical-rails to generate canonical URLs
-gem "canonical-rails"
+# Use unreleased version for rails 7.2.1+ compatibility
+gem "canonical-rails", :github => "jumph4x/canonical-rails", :ref => "fbc1c88c"
 
 # Used to generate logstash friendly log files
 gem "logstasher"
diff --git a/Gemfile.lock b/Gemfile.lock
index f334b3ac1..094449d26 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/jumph4x/canonical-rails.git
+  revision: fbc1c88c71131ddb1352953cd6048033fd2473e5
+  ref: fbc1c88c
+  specs:
+    canonical-rails (0.2.15)
+      actionview (>= 4.1, < 7.3)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -137,8 +145,6 @@ GEM
     bzip2-ffi (1.1.1)
       ffi (~> 1.0)
     cancancan (3.6.1)
-    canonical-rails (0.2.15)
-      actionview (>= 4.1, <= 7.2)
     capybara (3.40.0)
       addressable
       matrix
@@ -629,7 +635,7 @@ DEPENDENCIES
   browser (< 6)
   bzip2-ffi
   cancancan
-  canonical-rails
+  canonical-rails!
   capybara (>= 2.15)
   config
   connection_pool