From: Tom Hughes <tom@compton.nu>
Date: Thu, 24 Oct 2024 07:57:25 +0000 (+0100)
Subject: Revert to using released version of canonical-rails
X-Git-Tag: live~67
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b6b2fe6b8d943a561646995d6b3a7aa6584a4250

Revert to using released version of canonical-rails
---

diff --git a/Gemfile b/Gemfile
index 1e20da8d6..277346b83 100644
--- a/Gemfile
+++ b/Gemfile
@@ -118,8 +118,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"
diff --git a/Gemfile.lock b/Gemfile.lock
index ec6304793..a3c18f922 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,3 @@
-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:
@@ -145,6 +137,8 @@ GEM
     bzip2-ffi (1.1.1)
       ffi (~> 1.0)
     cancancan (3.6.1)
+    canonical-rails (0.2.16)
+      actionview (>= 4.1, < 7.3)
     capybara (3.40.0)
       addressable
       matrix
@@ -682,7 +676,7 @@ DEPENDENCIES
   browser (< 6)
   bzip2-ffi
   cancancan
-  canonical-rails!
+  canonical-rails
   capybara (>= 2.15)
   config
   connection_pool