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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 26bc7c1291ba18699dfe492ce6005b1e1c7d6572..277346b8388df908c3e110cff5b9bbb55a18cf84 100644 (file)
--- 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"
@@ -142,10 +141,15 @@ gem "image_processing"
 # 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"
+  gem "danger"
+  gem "danger-auto_label"
   gem "debug_inspector"
   gem "i18n-tasks"
   gem "listen"
@@ -179,6 +183,8 @@ end
 
 group :development, :test do
   gem "annotate"
+  gem "teaspoon"
+  gem "teaspoon-mocha", "~> 2.3.3"
 
   # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
   gem "debug", :require => "debug/prelude"