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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 7076b8c1f1997995fd42f9de5001448e841f073d..832b96c9ac9df43df595a969888cacb29ed57715 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -26,8 +26,8 @@ gem "jbuilder", "~> 2.7"
 # 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"
@@ -41,11 +41,14 @@ gem "argon2"
 # Support brotli compression for assets
 gem "sprockets-exporters_pack"
 
+# Restore File.exists? for oauth gem
+gem "file_exists"
+
 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
 gem "active_record_union"
-gem "bootstrap", :github => "gravitystorm/bootstrap-rubygem", :branch => "dartsass_5_2_3"
+gem "bootstrap", "~> 5.3.2"
 gem "bootstrap_form", "~> 5.0"
 gem "cancancan"
 gem "config"
@@ -133,6 +136,9 @@ gem "aws-sdk-s3"
 # Used to resize user images
 gem "image_processing"
 
+# Used to validate widths
+gem "unicode-display_width"
+
 # Gems useful for development
 group :development do
   gem "better_errors"
@@ -151,6 +157,7 @@ group :test do
   gem "factory_bot_rails"
   gem "jwt"
   gem "minitest", "~> 5.1"
+  gem "minitest-focus", :require => false
   gem "puma", "~> 5.6"
   gem "rails-controller-testing"
   gem "rubocop"