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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 804a9c1854aeb69c6471965ab160badf6d4ba4a9..1e20da8d64cd59740d7f54e834b88db50c04834c 100644 (file)
--- 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"
@@ -141,13 +142,15 @@ gem "image_processing"
 # Used to validate widths
 gem "unicode-display_width"
 
-gem "teaspoon"
-gem "teaspoon-mocha"
+# 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"
@@ -178,3 +181,12 @@ group :test do
   gem "simplecov-lcov", :require => false
   gem "webmock"
 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"
+end