Merge branch 'next-minor' into develop

1 files changed, 103 insertions, 83 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 7cee07c5f..bea73cbb4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,54 +1,72 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.8)
-      actionpack (= 5.2.8)
+    actioncable (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.8)
-      actionpack (= 5.2.8)
-      actionview (= 5.2.8)
-      activejob (= 5.2.8)
+    actionmailbox (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      mail (>= 2.7.1)
+    actionmailer (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      actionview (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.8)
-      actionview (= 5.2.8)
-      activesupport (= 5.2.8)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.6.1)
+      actionview (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.8)
-      activesupport (= 5.2.8)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.6.1)
+      activesupport (= 6.1.6.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_model_serializers (0.9.8)
       activemodel (>= 3.2)
       concurrent-ruby (~> 1.0)
-    activejob (5.2.8)
-      activesupport (= 5.2.8)
+    activejob (6.1.6.1)
+      activesupport (= 6.1.6.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.8)
-      activesupport (= 5.2.8)
-    activerecord (5.2.8)
-      activemodel (= 5.2.8)
-      activesupport (= 5.2.8)
-      arel (>= 9.0)
+    activemodel (6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activerecord (6.1.6.1)
+      activemodel (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
     activerecord-import (1.4.0)
       activerecord (>= 4.2)
-    activestorage (5.2.8)
-      actionpack (= 5.2.8)
-      activerecord (= 5.2.8)
-      marcel (~> 1.0.0)
-    activesupport (5.2.8)
+    activestorage (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    acts-as-taggable-on (8.1.0)
-      activerecord (>= 5.0, < 6.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    acts-as-taggable-on (9.0.1)
+      activerecord (>= 6.0, < 7.1)
     acts_as_api (1.0.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -59,7 +77,6 @@ GEM
     apparition (0.6.0)
       capybara (~> 3.13, < 4)
       websocket-driver (>= 0.6.5)
-    arel (9.0.0)
     asset_sync (2.15.2)
       activemodel (>= 4.1.0)
       fog-core
@@ -192,18 +209,18 @@ GEM
     devise_lastseenable (0.0.6)
       devise
       rails (>= 3.0.4)
-    diaspora_federation (0.2.7)
+    diaspora_federation (0.2.8)
       faraday (>= 0.9.0, < 1.0)
       faraday_middleware (>= 0.10.0, < 1.0)
       nokogiri (~> 1.6, >= 1.6.8)
       typhoeus (~> 1.0)
       valid (~> 1.0)
-    diaspora_federation-json_schema (0.2.7)
-    diaspora_federation-rails (0.2.7)
-      actionpack (>= 4.2, < 6)
-      diaspora_federation (= 0.2.7)
-    diaspora_federation-test (0.2.7)
-      diaspora_federation (= 0.2.7)
+    diaspora_federation-json_schema (0.2.8)
+    diaspora_federation-rails (0.2.8)
+      actionpack (>= 4.2, < 7)
+      diaspora_federation (= 0.2.8)
+    diaspora_federation-test (0.2.8)
+      diaspora_federation (= 0.2.8)
       fabrication (~> 2.16)
       uuid (~> 2.3, >= 2.3.8)
     diff-lcs (1.5.0)
@@ -319,7 +336,7 @@ GEM
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     i18n-inflector (2.6.7)
       i18n (>= 0.4.1)
@@ -347,8 +364,8 @@ GEM
       railties (>= 3.2.16)
     js-routes (2.2.4)
       railties (>= 4)
-    js_image_paths (0.1.1)
-      rails (>= 4.0, < 6.0)
+    js_image_paths (0.2.0)
+      rails (>= 4.0, < 8.0)
       sprockets (>= 3.0.0)
     json (2.6.2)
     json-jwt (1.13.0)
@@ -389,7 +406,7 @@ GEM
     mime-types-data (3.2022.0105)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.8.0)
     minitest (5.15.0)
     mobile-fu (1.4.0)
       rack-mobile-detect
@@ -401,8 +418,8 @@ GEM
     mysql2 (0.5.4)
     naught (1.1.0)
     nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.7)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oauth (0.5.10)
     oauth2 (2.0.2)
@@ -484,7 +501,7 @@ GEM
     public_suffix (4.0.7)
     raabro (1.4.0)
     racc (1.6.0)
-    rack (2.2.3.1)
+    rack (2.2.4)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-google-analytics (1.2.0)
@@ -504,20 +521,22 @@ GEM
     rack-rewrite (1.5.1)
     rack-ssl (1.4.1)
       rack
-    rack-test (2.0.0)
+    rack-test (2.0.2)
       rack (>= 1.3)
-    rails (5.2.8)
-      actioncable (= 5.2.8)
-      actionmailer (= 5.2.8)
-      actionpack (= 5.2.8)
-      actionview (= 5.2.8)
-      activejob (= 5.2.8)
-      activemodel (= 5.2.8)
-      activerecord (= 5.2.8)
-      activestorage (= 5.2.8)
-      activesupport (= 5.2.8)
-      bundler (>= 1.3.0)
-      railties (= 5.2.8)
+    rails (6.1.6.1)
+      actioncable (= 6.1.6.1)
+      actionmailbox (= 6.1.6.1)
+      actionmailer (= 6.1.6.1)
+      actionpack (= 6.1.6.1)
+      actiontext (= 6.1.6.1)
+      actionview (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activemodel (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      bundler (>= 1.15.0)
+      railties (= 6.1.6.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -528,18 +547,18 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    rails-i18n (5.1.3)
+    rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
-      railties (>= 5.0, < 6)
+      railties (>= 6.0.0, < 7)
     rails-timeago (2.20.0)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
-    railties (5.2.8)
-      actionpack (= 5.2.8)
-      activesupport (= 5.2.8)
+    railties (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
     rainbow (3.1.1)
     raindrops (0.20.0)
     rake (12.3.3)
@@ -619,11 +638,11 @@ GEM
     secure_headers (6.3.3)
     shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
-    sidekiq (6.4.2)
+    sidekiq (6.5.1)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
-    sidekiq-cron (1.4.0)
+    sidekiq-cron (1.6.0)
       fugit (~> 1)
       sidekiq (>= 4.2.1)
     simple_captcha2 (0.5.0)
@@ -637,7 +656,7 @@ GEM
     simplecov_json_formatter (0.1.4)
     sinon-rails (1.15.0)
       railties (>= 3.1)
-    sprockets (3.7.2)
+    sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-es6 (0.9.2)
@@ -688,8 +707,8 @@ GEM
       unf (~> 0.1.0)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
@@ -733,6 +752,7 @@ GEM
     yajl-ruby (1.4.1)
     yard (0.9.28)
       webrick (~> 1.7.0)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -740,7 +760,7 @@ PLATFORMS
 DEPENDENCIES
   active_model_serializers (= 0.9.8)
   activerecord-import (= 1.4.0)
-  acts-as-taggable-on (= 8.1.0)
+  acts-as-taggable-on (= 9.0.1)
   acts_as_api (= 1.0.1)
   addressable (= 2.8.0)
   apparition (= 0.6.0)
@@ -758,9 +778,9 @@ DEPENDENCIES
   devise (= 4.8.1)
   devise-two-factor (= 4.0.2)
   devise_lastseenable (= 0.0.6)
-  diaspora_federation-json_schema (= 0.2.7)
-  diaspora_federation-rails (= 0.2.7)
-  diaspora_federation-test (= 0.2.7)
+  diaspora_federation-json_schema (= 0.2.8)
+  diaspora_federation-rails (= 0.2.8)
+  diaspora_federation-test (= 0.2.8)
   eye (= 0.10.0)
   factory_bot_rails (= 6.1.0)
   faraday (= 0.17.5)
@@ -780,7 +800,7 @@ DEPENDENCIES
   jquery-rails (= 4.5.0)
   jquery-ui-rails (= 5.0.5)
   js-routes (= 2.2.4)
-  js_image_paths (= 0.1.1)
+  js_image_paths (= 0.2.0)
   json (= 2.6.2)
   json-schema (= 3.0.0)
   leaflet-rails (= 1.7.0)
@@ -790,7 +810,7 @@ DEPENDENCIES
   minitest (= 5.15.0)
   mobile-fu (= 1.4.0)
   mysql2 (= 0.5.4)
-  nokogiri (= 1.12.5)
+  nokogiri (= 1.13.7)
   omniauth (= 2.1.0)
   omniauth-rails_csrf_protection (= 1.0.1)
   omniauth-tumblr (= 1.2)
@@ -811,9 +831,9 @@ DEPENDENCIES
   rack-piwik (= 0.3.0)
   rack-rewrite (= 1.5.1)
   rack-ssl (= 1.4.1)
-  rails (= 5.2.8)
+  rails (= 6.1.6.1)
   rails-controller-testing (= 1.0.5)
-  rails-i18n (= 5.1.3)
+  rails-i18n (= 6.0.0)
   rails-timeago (= 2.20.0)
   redcarpet (= 3.5.1)
   redis (= 4.7.0)
@@ -828,8 +848,8 @@ DEPENDENCIES
   sassc-rails (= 2.1.2)
   secure_headers (= 6.3.3)
   shoulda-matchers (= 4.5.1)
-  sidekiq (= 6.4.2)
-  sidekiq-cron (= 1.4.0)
+  sidekiq (= 6.5.1)
+  sidekiq-cron (= 1.6.0)
   simple_captcha2 (= 0.5.0)
   simplecov (= 0.21.2)
   sinon-rails (= 1.15.0)
@@ -852,4 +872,4 @@ DEPENDENCIES
   yajl-ruby (= 1.4.1)
 
 BUNDLED WITH
-   1.17.3
+   2.3.18