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

[rails.git] / Gemfile

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


@@ -145,6 +142,8 @@ gem "unicode-display_width"
 group :development do
   gem "better_errors"
   gem "binding_of_caller"
 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"


@@ -177,7 +176,7 @@ 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"
 
   gem "teaspoon"
   gem "teaspoon-mocha", "~> 2.3.3"