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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index a2387771a00557ad48b9ee0eeba62e435c4cf5d5..ad6b3b3ef2637cc257b7d973de8c1c4eff23d674 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -129,9 +129,6 @@ gem "ffi-libarchive"
 gem "gd2-ffij", ">= 0.4.0"
 gem "marcel"
 
 gem "gd2-ffij", ">= 0.4.0"
 gem "marcel"
 

-# Used for browser detection
-gem "browser", "< 6" # for ruby 3.1 support
-

 # Used for S3 object storage
 gem "aws-sdk-s3"
 
 # Used for S3 object storage
 gem "aws-sdk-s3"
 


@@ -141,9 +138,6 @@ 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"
 # Gems useful for development
 group :development do
   gem "better_errors"


@@ -182,7 +176,9 @@ group :test do
 end
 
 group :development, :test do
 end
 
 group :development, :test do

-  gem "annotate"
+  gem "annotaterb"
+  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"
 
   # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
   gem "debug", :require => "debug/prelude"