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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 7bad308b49bef847fa3c65b2e8a6bc17e1b2de1e..39ffed86006555c094fa52d6c77394b1bfd9a8a1 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "7.0.4"
+gem "rails", "~> 7.0.0"

 
 # Require json for multi_json
 gem "json"
 
 # Require json for multi_json
 gem "json"


@@ -77,7 +77,7 @@ gem "omniauth-rails_csrf_protection", "~> 1.0"
 gem "omniauth-windowslive"
 
 # Doorkeeper for OAuth2
 gem "omniauth-windowslive"
 
 # Doorkeeper for OAuth2

-gem "doorkeeper", "~> 5.5.4"
+gem "doorkeeper"

 gem "doorkeeper-i18n"
 
 # Markdown formatting support
 gem "doorkeeper-i18n"
 
 # Markdown formatting support


@@ -137,6 +137,7 @@ group :development do
   gem "better_errors"
   gem "binding_of_caller"
   gem "debug_inspector"
   gem "better_errors"
   gem "binding_of_caller"
   gem "debug_inspector"

+  gem "i18n-tasks"

   gem "listen"
   gem "vendorer"
 end
   gem "listen"
   gem "vendorer"
 end


@@ -151,6 +152,8 @@ group :test do
   gem "puma", "~> 5.6"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "puma", "~> 5.6"
   gem "rails-controller-testing"
   gem "rubocop"

+  gem "rubocop-capybara"
+  gem "rubocop-factory_bot"

   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"