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

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2588a737f2e69f2894f15f54ccb3716466ef93ed..f2fa6763aa55a03af02acbfc6dc0f7fd42a3ca24 100644 (file)
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         ubuntu: [20.04, 22.04]
-        ruby: ['3.0', '3.1']
+        ruby: ['3.0', '3.1', '3.2']
     runs-on: ubuntu-${{ matrix.ubuntu }}
     env:
       RAILS_ENV: test

diff --git a/Gemfile b/Gemfile
index 98b03518877a8ef6a8a157e66af9f3d9e9049cb0..8dd0576d10ee2c94cfcc870244173f3557ad4f78 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -41,6 +41,9 @@ 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"

diff --git a/Gemfile.lock b/Gemfile.lock
index 212cdb73e7cce313501c0f239c230264e88e915a..7d97c6de7e216e4817b225f6e9bdb06c9e248213 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,7 +83,7 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
@@ -95,7 +95,7 @@ GEM
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.863.0)
+    aws-partitions (1.864.0)
     aws-sdk-core (3.190.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
@@ -169,7 +169,7 @@ GEM
       sprockets-rails
       tilt
     date (3.3.4)
-    debug_inspector (1.1.0)
+    debug_inspector (1.2.0)
     deep_merge (1.2.2)
     delayed_job (4.1.11)
       activesupport (>= 3.0, < 8.0)
@@ -244,6 +244,7 @@ GEM
       rake
     ffi-libarchive (1.1.13)
       ffi (~> 1.0)
+    file_exists (0.2.0)
     frozen_record (0.27.0)
       activemodel
     fspath (3.1.2)
@@ -334,7 +335,7 @@ GEM
     multi_json (1.15.0)
     multi_xml (0.6.0)
     mutex_m (0.2.0)
-    net-imap (0.4.7)
+    net-imap (0.4.8)
       date
       net-protocol
     net-pop (0.1.2)
@@ -477,7 +478,7 @@ GEM
     rouge (4.2.0)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)
-    rubocop (1.58.0)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -519,7 +520,7 @@ GEM
       google-protobuf (~> 3.23)
       rake (>= 13.0.0)
     secure_headers (6.5.0)
-    selenium-webdriver (4.15.0)
+    selenium-webdriver (4.16.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -610,6 +611,7 @@ DEPENDENCIES
   factory_bot_rails
   faraday
   ffi-libarchive
+  file_exists
   frozen_record
   gd2-ffij (>= 0.4.0)
   htmlentities