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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 9dc8f5cbdadc789b15d43c8db07927bdc2ba931a..b75e9360678aa89124b6ee8d7f5ce5558c77a796 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,440 +1,478 @@
 GEM
   remote: https://rubygems.org/
   specs:
 GEM
   remote: https://rubygems.org/
   specs:

-    aasm (5.2.0)
+    aasm (5.5.0)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-    actioncable (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actioncable (7.0.7)
+      actionpack (= 7.0.7)
+      activesupport (= 7.0.7)

       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)

-    actionmailbox (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionmailbox (7.0.7)
+      actionpack (= 7.0.7)
+      activejob (= 7.0.7)
+      activerecord (= 7.0.7)
+      activestorage (= 7.0.7)
+      activesupport (= 7.0.7)

       mail (>= 2.7.1)
       mail (>= 2.7.1)

-    actionmailer (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      actionview (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.7)
+      actionpack (= 7.0.7)
+      actionview (= 7.0.7)
+      activejob (= 7.0.7)
+      activesupport (= 7.0.7)

       mail (~> 2.5, >= 2.5.4)
       mail (~> 2.5, >= 2.5.4)

+      net-imap
+      net-pop
+      net-smtp

       rails-dom-testing (~> 2.0)
       rails-dom-testing (~> 2.0)

-    actionpack (6.1.3.2)
-      actionview (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.7)
+      actionview (= 7.0.7)
+      activesupport (= 7.0.7)
+      rack (~> 2.0, >= 2.2.4)

       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)

-    actiontext (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actiontext (7.0.7)
+      actionpack (= 7.0.7)
+      activerecord (= 7.0.7)
+      activestorage (= 7.0.7)
+      activesupport (= 7.0.7)
+      globalid (>= 0.6.0)

       nokogiri (>= 1.8.5)
       nokogiri (>= 1.8.5)

-    actionview (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionview (7.0.7)
+      activesupport (= 7.0.7)

       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_union (1.3.0)
       activerecord (>= 4.0)

-    activejob (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    activejob (7.0.7)
+      activesupport (= 7.0.7)

       globalid (>= 0.3.6)
       globalid (>= 0.3.6)

-    activemodel (6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activerecord (6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activerecord-import (1.1.0)
-      activerecord (>= 3.2)
-    activestorage (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-      marcel (~> 1.0.0)
-      mini_mime (~> 1.0.2)
-    activesupport (6.1.3.2)
+    activemodel (7.0.7)
+      activesupport (= 7.0.7)
+    activerecord (7.0.7)
+      activemodel (= 7.0.7)
+      activesupport (= 7.0.7)
+    activerecord-import (1.4.1)
+      activerecord (>= 4.2)
+    activestorage (7.0.7)
+      actionpack (= 7.0.7)
+      activejob (= 7.0.7)
+      activerecord (= 7.0.7)
+      activesupport (= 7.0.7)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.7)

       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)

-      zeitwerk (~> 2.3)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    annotate (3.1.1)
-      activerecord (>= 3.2, < 7.0)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
+    annotate (3.2.0)
+      activerecord (>= 3.2, < 8.0)

       rake (>= 10.4, < 14.0)
       rake (>= 10.4, < 14.0)

+    argon2 (2.2.0)
+      ffi (~> 1.15)
+      ffi-compiler (~> 1.0)

     ast (2.4.2)
     ast (2.4.2)

-    autoprefixer-rails (10.2.5.1)
-      execjs (> 0)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.470.0)
-    aws-sdk-core (3.115.0)
+    autoprefixer-rails (10.4.13.0)
+      execjs (~> 2)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.804.0)
+    aws-sdk-core (3.180.3)

       aws-eventstream (~> 1, >= 1.0.2)
       aws-eventstream (~> 1, >= 1.0.2)

-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.71.0)
+      aws-sdk-core (~> 3, >= 3.177.0)

       aws-sigv4 (~> 1.1)
       aws-sigv4 (~> 1.1)

-      jmespath (~> 1.0)
-    aws-sdk-kms (1.44.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.96.1)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-s3 (1.132.1)
+      aws-sdk-core (~> 3, >= 3.179.0)

       aws-sdk-kms (~> 1)
       aws-sdk-kms (~> 1)

-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.3)
+      aws-sigv4 (~> 1.6)
+    aws-sigv4 (1.6.0)

       aws-eventstream (~> 1, >= 1.0.2)
       aws-eventstream (~> 1, >= 1.0.2)

-    better_errors (2.9.1)
-      coderay (>= 1.0.0)
+    base64 (0.1.1)
+    better_errors (2.10.1)

       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)

-    better_html (1.0.16)
-      actionview (>= 4.0)
-      activesupport (>= 4.0)
+      rouge (>= 1.0.0)
+    better_html (2.0.2)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)

       ast (~> 2.0)
       erubi (~> 1.4)
       ast (~> 2.0)
       erubi (~> 1.4)

-      html_tokenizer (~> 0.0.6)

       parser (>= 2.4)
       smart_properties
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
       parser (>= 2.4)
       smart_properties
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)

-    bootsnap (1.7.5)
-      msgpack (~> 1.0)
-    bootstrap (4.5.3)
+    bootsnap (1.16.0)
+      msgpack (~> 1.2)
+    bootstrap (5.1.3)

       autoprefixer-rails (>= 9.1.0)
       autoprefixer-rails (>= 9.1.0)

-      popper_js (>= 1.14.3, < 2)
+      popper_js (>= 2.9.3, < 3)

       sassc-rails (>= 2.0.0)
       sassc-rails (>= 2.0.0)

-    bootstrap_form (4.5.0)
-      actionpack (>= 5.2)
-      activemodel (>= 5.2)
-    brakeman (5.0.4)
+    bootstrap_form (5.2.3)
+      actionpack (>= 6.0)
+      activemodel (>= 6.0)
+    brakeman (6.0.1)
+    brotli (0.4.0)

     browser (5.3.1)
     builder (3.2.4)
     browser (5.3.1)
     builder (3.2.4)

-    bzip2-ffi (1.1.0)
+    bzip2-ffi (1.1.1)

       ffi (~> 1.0)
       ffi (~> 1.0)

-    cancancan (3.3.0)
-    canonical-rails (0.2.11)
-      rails (>= 4.1, < 6.2)
-    capybara (3.35.3)
+    cancancan (3.5.0)
+    canonical-rails (0.2.14)
+      rails (>= 4.1, <= 7.1)
+    capybara (3.39.2)

       addressable
       addressable

+      matrix

       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)

-    childprocess (3.0.0)
-    coderay (1.1.3)
-    composite_primary_keys (13.0.0)
-      activerecord (~> 6.1.0)
-    concurrent-ruby (1.1.9)
-    config (3.1.0)
+    composite_primary_keys (14.0.6)
+      activerecord (~> 7.0.2)
+    concurrent-ruby (1.2.2)
+    config (4.2.1)

       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)

+    connection_pool (2.4.1)

     crack (0.4.5)
       rexml
     crass (1.0.6)
     crack (0.4.5)
       rexml
     crass (1.0.6)

-    dalli (2.7.11)
+    dalli (3.2.5)
+    date (3.3.3)

     debug_inspector (1.1.0)
     debug_inspector (1.1.0)

-    deep_merge (1.2.1)
-    delayed_job (4.1.9)
-      activesupport (>= 3.0, < 6.2)
-    delayed_job_active_record (4.1.6)
-      activerecord (>= 3.0, < 6.2)
+    deep_merge (1.2.2)
+    delayed_job (4.1.11)
+      activesupport (>= 3.0, < 8.0)
+    delayed_job_active_record (4.1.7)
+      activerecord (>= 3.0, < 8.0)

       delayed_job (>= 3.0, < 5)
     docile (1.4.0)
       delayed_job (>= 3.0, < 5)
     docile (1.4.0)

-    doorkeeper (5.5.2)
+    doorkeeper (5.6.6)

       railties (>= 5)
       railties (>= 5)

-    doorkeeper-i18n (5.2.2)
+    doorkeeper-i18n (5.2.6)

       doorkeeper (>= 5.2)
       doorkeeper (>= 5.2)

-    dry-configurable (0.12.1)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.8.0)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.6.0)
+    dry-configurable (1.1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.1)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-    dry-equalizer (0.3.0)
-    dry-inflector (0.2.0)
-    dry-initializer (3.0.4)
-    dry-logic (1.2.0)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.0.0)
+    dry-initializer (3.1.1)
+    dry-logic (1.5.0)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-      dry-core (~> 0.5, >= 0.5)
-    dry-schema (1.6.2)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-schema (1.13.2)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-      dry-configurable (~> 0.8, >= 0.8.3)
-      dry-core (~> 0.5, >= 0.5)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)

       dry-initializer (~> 3.0)
       dry-initializer (~> 3.0)

-      dry-logic (~> 1.0)
-      dry-types (~> 1.5)
-    dry-types (1.5.1)
+      dry-logic (>= 1.4, < 2)
+      dry-types (>= 1.7, < 2)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.1)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    dry-validation (1.6.0)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
+    dry-validation (1.10.0)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-      dry-container (~> 0.7, >= 0.7.1)
-      dry-core (~> 0.4)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 1.0, < 2)

       dry-initializer (~> 3.0)
       dry-initializer (~> 3.0)

-      dry-schema (~> 1.5, >= 1.5.2)
-    erb_lint (0.0.37)
+      dry-schema (>= 1.12, < 2)
+      zeitwerk (~> 2.6)
+    erb_lint (0.4.0)

       activesupport
       activesupport

-      better_html (~> 1.0.7)
-      html_tokenizer
+      better_html (>= 2.0.1)

       parser (>= 2.7.1.4)
       rainbow
       rubocop
       smart_properties
       parser (>= 2.7.1.4)
       rainbow
       rubocop
       smart_properties

-    erubi (1.10.0)
+    erubi (1.12.0)

     execjs (2.8.1)
     execjs (2.8.1)

-    exifr (1.3.9)
-    factory_bot (6.2.0)
+    exifr (1.4.0)
+    factory_bot (6.2.1)

       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)

-    faraday (1.4.2)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.7.10)
+      faraday-net_http (>= 2.0, < 3.1)

       ruby2_keywords (>= 0.0.4)
       ruby2_keywords (>= 0.0.4)

-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
-    ffi (1.15.3)
-    ffi-libarchive (1.0.17)
+    faraday-net_http (3.0.2)
+    ffi (1.15.5)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
+    ffi-libarchive (1.1.3)

       ffi (~> 1.0)
       ffi (~> 1.0)

+    frozen_record (0.27.0)
+      activemodel

     fspath (3.1.2)
     gd2-ffij (0.4.0)
       ffi (>= 1.0.0)
     fspath (3.1.2)
     gd2-ffij (0.4.0)
       ffi (>= 1.0.0)

-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    globalid (1.1.0)
+      activesupport (>= 5.0)

     hashdiff (1.0.1)
     hashdiff (1.0.1)

-    hashie (4.1.0)
-    html_tokenizer (0.0.7)
+    hashie (5.0.0)
+    highline (2.1.0)

     htmlentities (4.3.4)
     http_accept_language (2.1.1)
     htmlentities (4.3.4)
     http_accept_language (2.1.1)

-    i18n (1.8.10)
+    i18n (1.14.1)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-    i18n-js (3.8.3)
+    i18n-js (3.9.2)

       i18n (>= 0.6.6)
       i18n (>= 0.6.6)

-    image_optim (0.30.0)
+    i18n-tasks (1.0.12)
+      activesupport (>= 4.0.2)
+      ast (>= 2.1.0)
+      better_html (>= 1.0, < 3.0)
+      erubi
+      highline (>= 2.0.0)
+      i18n
+      parser (>= 2.2.3.0)
+      rails-i18n
+      rainbow (>= 2.2.2, < 4.0)
+      terminal-table (>= 1.5.1)
+    image_optim (0.31.3)

       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)

-      image_size (>= 1.5, < 3)
+      image_size (>= 1.5, < 4)

       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)

-    image_optim_rails (0.4.3)
+    image_optim_rails (0.5.0)

       image_optim (~> 0.24)
       image_optim (~> 0.24)

-      rails
+      railties

       sprockets
       sprockets

-    image_processing (1.12.1)
+    image_processing (1.12.2)

       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)

-    image_size (2.1.0)
-    in_threads (1.5.4)
-    jbuilder (2.11.2)
+    image_size (3.3.0)
+    in_threads (1.6.0)
+    jbuilder (2.11.5)
+      actionview (>= 5.0.0)

       activesupport (>= 5.0.0)
       activesupport (>= 5.0.0)

-    jmespath (1.4.0)
-    jquery-rails (4.4.0)
+    jmespath (1.6.2)
+    jquery-rails (4.6.0)

       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)

-    json (2.5.1)
-    jwt (2.2.3)
+    json (2.6.3)
+    jwt (2.7.1)

     kgio (2.11.4)
     kgio (2.11.4)

-    kramdown (2.3.1)
+    kramdown (2.4.0)

       rexml
       rexml

-    libxml-ruby (3.2.1)
-    listen (3.5.1)
+    language_server-protocol (3.17.0.3)
+    libxml-ruby (4.1.1)
+    listen (3.8.0)

       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logstasher (2.1.5)
       activesupport (>= 5.2)
       request_store
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logstasher (2.1.5)
       activesupport (>= 5.2)
       request_store

-    loofah (2.10.0)
+    loofah (2.21.3)

       crass (~> 1.0.2)
       crass (~> 1.0.2)

-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)

       mini_mime (>= 0.1.1)
       mini_mime (>= 0.1.1)

-    marcel (1.0.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.2)
+    matrix (0.4.2)

     maxminddb (0.1.22)
     method_source (1.0.0)
     maxminddb (0.1.22)
     method_source (1.0.0)

-    mini_magick (4.11.0)
-    mini_mime (1.0.3)
-    mini_portile2 (2.5.3)
-    minitest (5.14.4)
-    msgpack (1.4.2)
+    mini_magick (4.12.0)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.4)
+    minitest (5.19.0)
+    msgpack (1.7.2)

     multi_json (1.15.0)
     multi_xml (0.6.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)

-    multipart-post (2.1.1)
-    nio4r (2.5.7)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    net-imap (0.3.7)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.9)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)

       racc (~> 1.4)
       racc (~> 1.4)

-    nokogumbo (2.0.5)
-      nokogiri (~> 1.8, >= 1.8.4)

     oauth (0.4.7)
     oauth-plugin (0.5.1)
       multi_json
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
     oauth (0.4.7)
     oauth-plugin (0.5.1)
       multi_json
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack

-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (2.0.9)
+      faraday (>= 0.17.3, < 3.0)

       jwt (>= 1.0, < 3.0)
       jwt (>= 1.0, < 3.0)

-      multi_json (~> 1.3)

       multi_xml (~> 0.5)
       multi_xml (~> 0.5)

-      rack (>= 1.2, < 3)
+      rack (>= 1.2, < 4)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)

     omniauth (2.0.4)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
       rack-protection
     omniauth (2.0.4)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
       rack-protection

-    omniauth-facebook (8.0.0)
+    omniauth-facebook (9.0.0)

       omniauth-oauth2 (~> 1.2)
       omniauth-oauth2 (~> 1.2)

-    omniauth-github (2.0.0)
+    omniauth-github (2.0.1)

       omniauth (~> 2.0)
       omniauth (~> 2.0)

-      omniauth-oauth2 (~> 1.7.1)
-    omniauth-google-oauth2 (1.0.0)
+      omniauth-oauth2 (~> 1.8)
+    omniauth-google-oauth2 (1.1.1)

       jwt (>= 2.0)
       jwt (>= 2.0)

-      oauth2 (~> 1.1)
+      oauth2 (~> 2.0.6)

       omniauth (~> 2.0)
       omniauth (~> 2.0)

-      omniauth-oauth2 (~> 1.7.1)
+      omniauth-oauth2 (~> 1.8.0)

     omniauth-mediawiki (0.0.4)
       jwt (~> 2.0)
       omniauth-oauth (~> 1.0)
     omniauth-oauth (1.2.0)
       oauth
       omniauth (>= 1.0, < 3)
     omniauth-mediawiki (0.0.4)
       jwt (~> 2.0)
       omniauth-oauth (~> 1.0)
     omniauth-oauth (1.2.0)
       oauth
       omniauth (>= 1.0, < 3)

-    omniauth-oauth2 (1.7.1)
-      oauth2 (~> 1.4)
-      omniauth (>= 1.9, < 3)
+    omniauth-oauth2 (1.8.0)
+      oauth2 (>= 1.4, < 3)
+      omniauth (~> 2.0)

     omniauth-openid (2.0.1)
       omniauth (>= 1.0, < 3.0)
       rack-openid (~> 1.4.0)
     omniauth-openid (2.0.1)
       omniauth (>= 1.0, < 3.0)
       rack-openid (~> 1.4.0)

-    omniauth-rails_csrf_protection (1.0.0)
+    omniauth-rails_csrf_protection (1.0.1)

       actionpack (>= 4.2)
       omniauth (~> 2.0)
     omniauth-windowslive (0.0.12)
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     omniauth-windowslive (0.0.12)
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.1)

-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.23.0)
+    parser (3.2.2.3)

       ast (~> 2.4.1)
       ast (~> 2.4.1)

-    pg (1.2.3)
-    popper_js (1.16.0)
+      racc
+    pg (1.5.3)
+    popper_js (2.11.8)

     progress (3.6.0)
     progress (3.6.0)

-    public_suffix (4.0.6)
-    puma (5.3.2)
+    public_suffix (5.0.3)
+    puma (5.6.6)

       nio4r (~> 2.0)
     quad_tile (1.0.1)
       nio4r (~> 2.0)
     quad_tile (1.0.1)

-    r2 (0.2.7)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-cors (1.1.1)
+    r2 (0.2.8)
+    racc (1.7.1)
+    rack (2.2.8)
+    rack-cors (2.0.1)

       rack (>= 2.0.0)
     rack-openid (1.4.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
       rack (>= 2.0.0)
     rack-openid (1.4.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)

-    rack-protection (2.1.0)
-      rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack-protection (3.1.0)
+      rack (~> 2.2, >= 2.2.4)
+    rack-test (2.1.0)
+      rack (>= 1.3)

     rack-uri_sanitizer (0.0.2)
     rack-uri_sanitizer (0.0.2)

-    rails (6.1.3.2)
-      actioncable (= 6.1.3.2)
-      actionmailbox (= 6.1.3.2)
-      actionmailer (= 6.1.3.2)
-      actionpack (= 6.1.3.2)
-      actiontext (= 6.1.3.2)
-      actionview (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    rails (7.0.7)
+      actioncable (= 7.0.7)
+      actionmailbox (= 7.0.7)
+      actionmailer (= 7.0.7)
+      actionpack (= 7.0.7)
+      actiontext (= 7.0.7)
+      actionview (= 7.0.7)
+      activejob (= 7.0.7)
+      activemodel (= 7.0.7)
+      activerecord (= 7.0.7)
+      activestorage (= 7.0.7)
+      activesupport (= 7.0.7)

       bundler (>= 1.15.0)
       bundler (>= 1.15.0)

-      railties (= 6.1.3.2)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.7)

     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)

-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest

       nokogiri (>= 1.6)
       nokogiri (>= 1.6)

-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    rails-i18n (6.0.0)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    rails-i18n (7.0.8)

       i18n (>= 0.7, < 2)
       i18n (>= 0.7, < 2)

-      railties (>= 6.0.0, < 7)
-    railties (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+      railties (>= 6.0.0, < 8)
+    railties (7.0.7)
+      actionpack (= 7.0.7)
+      activesupport (= 7.0.7)

       method_source
       method_source

-      rake (>= 0.8.7)
+      rake (>= 12.2)

       thor (~> 1.0)
       thor (~> 1.0)

-    rainbow (3.0.0)
-    rake (13.0.3)
-    rb-fsevent (0.11.0)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rb-fsevent (0.11.2)

     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)

-    regexp_parser (2.1.1)
-    request_store (1.5.0)
+    regexp_parser (2.8.1)
+    request_store (1.5.1)

       rack (>= 1.4)
       rack (>= 1.4)

-    rexml (3.2.5)
+    rexml (3.2.6)

     rinku (2.0.6)
     rinku (2.0.6)

-    rotp (6.2.0)
-    rubocop (1.17.0)
+    rotp (6.2.2)
+    rouge (4.1.3)
+    rubocop (1.56.0)
+      base64 (~> 0.1.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)

       parallel (~> 1.10)
       parallel (~> 1.10)

-      parser (>= 3.0.0.0)
+      parser (>= 3.2.2.3)

       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)

-      rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.1, < 2.0)

       ruby-progressbar (~> 1.7)
       ruby-progressbar (~> 1.7)

-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
-      parser (>= 3.0.1.1)
-    rubocop-minitest (0.13.0)
-      rubocop (>= 0.90, < 2.0)
-    rubocop-performance (1.11.3)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
+    rubocop-minitest (0.31.0)
+      rubocop (>= 1.39, < 2.0)
+    rubocop-performance (1.19.0)

       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)

-    rubocop-rails (2.11.0)
+    rubocop-rails (2.20.2)

       activesupport (>= 4.2.0)
       rack (>= 1.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)

-      rubocop (>= 1.7.0, < 2.0)
-    rubocop-rake (0.5.1)
-      rubocop
+      rubocop (>= 1.33.0, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)

     ruby-openid (2.9.2)
     ruby-openid (2.9.2)

-    ruby-progressbar (1.11.0)
-    ruby-vips (2.1.2)
+    ruby-progressbar (1.13.0)
+    ruby-vips (2.1.4)

       ffi (~> 1.12)
       ffi (~> 1.12)

-    ruby2_keywords (0.0.4)
-    rubyzip (2.3.0)
-    sanitize (5.2.3)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    sanitize (6.0.2)

       crass (~> 1.0.2)
       crass (~> 1.0.2)

-      nokogiri (>= 1.8.0)
-      nokogumbo (~> 2.0)
+      nokogiri (>= 1.12.0)

     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)


@@ -443,47 +481,59 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
       sprockets (> 3.0)
       sprockets-rails
       tilt

-    secure_headers (6.3.2)
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
-      rubyzip (>= 1.2.2)
-    simplecov (0.21.2)
+    secure_headers (6.5.0)
+    selenium-webdriver (4.11.0)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
+    simplecov (0.22.0)

       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)

-    simplecov_json_formatter (0.1.3)
-    smart_properties (1.15.0)
-    sprockets (4.0.2)
+    simplecov_json_formatter (0.1.4)
+    smart_properties (1.17.0)
+    snaky_hash (2.0.1)
+      hashie
+      version_gem (~> 1.1, >= 1.1.1)
+    sprockets (4.2.0)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-exporters_pack (0.1.2)
+      brotli (>= 0.2.0)
+      sprockets (>= 4.0.0.beta3)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)

       sprockets (>= 3.0.0)
       sprockets (>= 3.0.0)

-    strong_migrations (0.7.7)
-      activerecord (>= 5)
-    thor (1.1.0)
-    tilt (2.0.10)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    uglifier (4.2.0)
+    strong_migrations (1.6.1)
+      activerecord (>= 5.2)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    terser (1.1.17)

       execjs (>= 0.3.0, < 3)
       execjs (>= 0.3.0, < 3)

-    unicode-display_width (2.0.0)
-    validates_email_format_of (1.6.3)
+    thor (1.2.2)
+    tilt (2.2.0)
+    timeout (0.4.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.4.2)
+    validates_email_format_of (1.7.2)

       i18n
     vendorer (0.2.0)
       i18n
     vendorer (0.2.0)

-    webmock (3.13.0)
-      addressable (>= 2.3.6)
+    version_gem (1.1.3)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)

       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

-    websocket-driver (0.7.5)
+    websocket (1.2.9)
+    websocket-driver (0.7.6)

       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)

-    zeitwerk (2.4.2)
+    zeitwerk (2.6.11)

 
 PLATFORMS
   ruby
 
 PLATFORMS
   ruby


@@ -494,21 +544,23 @@ DEPENDENCIES
   active_record_union
   activerecord-import
   annotate
   active_record_union
   activerecord-import
   annotate

+  argon2

   autoprefixer-rails
   aws-sdk-s3
   better_errors
   binding_of_caller
   bootsnap (>= 1.4.2)
   autoprefixer-rails
   aws-sdk-s3
   better_errors
   binding_of_caller
   bootsnap (>= 1.4.2)

-  bootstrap (~> 4.5.0)
-  bootstrap_form (~> 4.0)
+  bootstrap (~> 5.1.0)
+  bootstrap_form (~> 5.0)

   brakeman
   browser
   bzip2-ffi
   cancancan
   canonical-rails
   capybara (>= 2.15)
   brakeman
   browser
   bzip2-ffi
   cancancan
   canonical-rails
   capybara (>= 2.15)

-  composite_primary_keys (~> 13.0.0)
+  composite_primary_keys (~> 14.0.0)

   config
   config

+  connection_pool

   dalli
   debug_inspector
   delayed_job_active_record
   dalli
   debug_inspector
   delayed_job_active_record


@@ -518,10 +570,12 @@ DEPENDENCIES
   factory_bot_rails
   faraday
   ffi-libarchive
   factory_bot_rails
   faraday
   ffi-libarchive

+  frozen_record

   gd2-ffij (>= 0.4.0)
   htmlentities
   http_accept_language (~> 2.1.1)
   gd2-ffij (>= 0.4.0)
   htmlentities
   http_accept_language (~> 2.1.1)

-  i18n-js (>= 3.0.0)
+  i18n-js (~> 3.9.2)
+  i18n-tasks

   image_optim_rails
   image_processing
   jbuilder (~> 2.7)
   image_optim_rails
   image_processing
   jbuilder (~> 2.7)


@@ -546,17 +600,19 @@ DEPENDENCIES
   omniauth-windowslive
   openstreetmap-deadlock_retry (>= 1.3.1)
   pg
   omniauth-windowslive
   openstreetmap-deadlock_retry (>= 1.3.1)
   pg

-  puma (~> 5.3)
+  puma (~> 5.6)

   quad_tile (~> 1.0.1)
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
   quad_tile (~> 1.0.1)
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer

-  rails (= 6.1.3.2)
+  rails (~> 7.0.0)

   rails-controller-testing
   rails-controller-testing

-  rails-i18n (~> 6.0.0)
+  rails-i18n (~> 7.0.0)

   rinku (>= 2.0.6)
   rotp
   rubocop
   rinku (>= 2.0.6)
   rotp
   rubocop

+  rubocop-capybara
+  rubocop-factory_bot

   rubocop-minitest
   rubocop-performance
   rubocop-rails
   rubocop-minitest
   rubocop-performance
   rubocop-rails


@@ -567,11 +623,12 @@ DEPENDENCIES
   selenium-webdriver
   simplecov
   simplecov-lcov
   selenium-webdriver
   simplecov
   simplecov-lcov

+  sprockets-exporters_pack

   strong_migrations
   strong_migrations

-  uglifier (>= 1.3.0)
+  terser

   validates_email_format_of (>= 1.5.1)
   vendorer
   webmock
 
 BUNDLED WITH
   validates_email_format_of (>= 1.5.1)
   vendorer
   webmock
 
 BUNDLED WITH

-   2.2.16
+   2.3.26