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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 8a5d4432a06425e1f6d0b9ff2d9bf0cf2009a3a8..98b03518877a8ef6a8a157e66af9f3d9e9049cb0 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.0"
+gem "rails", "~> 7.1.0"

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


@@ -10,7 +10,9 @@ gem "json"
 gem "pg"
 
 # Use SCSS for stylesheets
 gem "pg"
 
 # Use SCSS for stylesheets

-gem "sassc-rails"
+gem "dartsass-sprockets"
+# Pin the dependentent sass-embedded to avoid deprecation warnings in bootstrap
+gem "sass-embedded", "~> 1.64.0"

 
 # Use Terser as compressor for JavaScript assets
 gem "terser"
 
 # Use Terser as compressor for JavaScript assets
 gem "terser"


@@ -24,8 +26,8 @@ gem "jbuilder", "~> 2.7"
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", ">= 1.4.2", :require => false
 
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", ">= 1.4.2", :require => false
 

-# Use R2 for RTL conversion
-gem "r2", "~> 0.2.7"
+# Use rtlcss for RTL conversion
+gem "rtlcss"

 
 # Use autoprefixer to generate CSS prefixes
 gem "autoprefixer-rails"
 
 # Use autoprefixer to generate CSS prefixes
 gem "autoprefixer-rails"


@@ -43,10 +45,9 @@ gem "sprockets-exporters_pack"
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
 gem "active_record_union"
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
 gem "active_record_union"

-gem "bootstrap", "~> 5.1.0"
+gem "bootstrap", "~> 5.3.2"

 gem "bootstrap_form", "~> 5.0"
 gem "cancancan"
 gem "bootstrap_form", "~> 5.0"
 gem "cancancan"

-gem "composite_primary_keys", "~> 14.0.0"

 gem "config"
 gem "delayed_job_active_record"
 gem "frozen_record"
 gem "config"
 gem "delayed_job_active_record"
 gem "frozen_record"


@@ -72,13 +73,14 @@ gem "omniauth-facebook"
 gem "omniauth-github"
 gem "omniauth-google-oauth2", ">= 0.6.0"
 gem "omniauth-mediawiki", ">= 0.0.4"
 gem "omniauth-github"
 gem "omniauth-google-oauth2", ">= 0.6.0"
 gem "omniauth-mediawiki", ">= 0.0.4"

+gem "omniauth-microsoft_graph"

 gem "omniauth-openid"
 gem "omniauth-rails_csrf_protection", "~> 1.0"
 gem "omniauth-openid"
 gem "omniauth-rails_csrf_protection", "~> 1.0"

-gem "omniauth-windowslive"

 
 # Doorkeeper for OAuth2
 gem "doorkeeper"
 gem "doorkeeper-i18n"
 
 # Doorkeeper for OAuth2
 gem "doorkeeper"
 gem "doorkeeper-i18n"

+gem "doorkeeper-openid_connect"

 
 # Markdown formatting support
 gem "kramdown"
 
 # Markdown formatting support
 gem "kramdown"


@@ -133,10 +135,10 @@ gem "image_processing"
 
 # Gems useful for development
 group :development do
 
 # Gems useful for development
 group :development do

-  gem "annotate"

   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


@@ -147,11 +149,13 @@ group :test do
   gem "capybara", ">= 2.15"
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "capybara", ">= 2.15"
   gem "erb_lint", :require => false
   gem "factory_bot_rails"

+  gem "jwt"

   gem "minitest", "~> 5.1"
   gem "puma", "~> 5.6"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-capybara"
   gem "minitest", "~> 5.1"
   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"


@@ -161,3 +165,7 @@ group :test do
   gem "simplecov-lcov", :require => false
   gem "webmock"
 end
   gem "simplecov-lcov", :require => false
   gem "webmock"
 end

+
+group :development, :test do
+  gem "annotate"
+end