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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index af3b9c09fad932b006348a461b2f68d90c744be5..1e20da8d64cd59740d7f54e834b88db50c04834c 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"


@@ -141,10 +142,15 @@ gem "image_processing"
 # Used to validate widths
 gem "unicode-display_width"
 
 # Used to validate widths
 gem "unicode-display_width"
 

+# Lock some modules to old versions for ruby 3.1 support
+gem "zeitwerk", "< 2.7"
+

 # Gems useful for development
 group :development do
   gem "better_errors"
   gem "binding_of_caller"
 # Gems useful for development
 group :development do
   gem "better_errors"
   gem "binding_of_caller"

+  gem "danger"
+  gem "danger-auto_label"

   gem "debug_inspector"
   gem "i18n-tasks"
   gem "listen"
   gem "debug_inspector"
   gem "i18n-tasks"
   gem "listen"