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

diff --git a/Gemfile b/Gemfile
index b25255320c5614ec01e9795a0632d6fe3a676458..26bc7c1291ba18699dfe492ce6005b1e1c7d6572 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -118,7 +118,8 @@ gem "dalli"
 gem "kgio"
 
 # Load canonical-rails to generate canonical URLs
 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"
 
 # Used to generate logstash friendly log files
 gem "logstasher"

diff --git a/Gemfile.lock b/Gemfile.lock
index f334b3ac104f8e4cfc3b136f0174918b8c3e4ffb..094449d265a9629be887cf72ce43ad47615df7d1 100644 (file)
--- 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:
 GEM
   remote: https://rubygems.org/
   specs:


@@ -137,8 +145,6 @@ GEM
     bzip2-ffi (1.1.1)
       ffi (~> 1.0)
     cancancan (3.6.1)
     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
     capybara (3.40.0)
       addressable
       matrix


@@ -629,7 +635,7 @@ DEPENDENCIES
   browser (< 6)
   bzip2-ffi
   cancancan
   browser (< 6)
   bzip2-ffi
   cancancan

-  canonical-rails
+  canonical-rails!

   capybara (>= 2.15)
   config
   connection_pool
   capybara (>= 2.15)
   config
   connection_pool