Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `config/environments/production.rb`:
  Upstream changed a header but we had different default headers.
  Applied the same change, and also dropped HSTS headers redundant with
  Rails'.

diff --cc Gemfile
index 67c50d19fafb1a65d2ad91b4ba911dfe169b308e,9baefcf74eab6881e1802f48b074cf867dafa7c0..bcda409a90acfdc394fcb9d50bc0f3d37007bd12
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -96,13 -96,11 +96,13 @@@ gem 'webpush', '~> 0.3
  gem 'webauthn', '~> 3.0.0.alpha1'
  
  gem 'json-ld'
- gem 'json-ld-preloaded', '~> 3.1'
+ gem 'json-ld-preloaded', '~> 3.2'
  gem 'rdf-normalize', '~> 0.4'
  
 +gem 'redcarpet', '~> 3.5'
 +
  group :development, :test do
-   gem 'fabrication', '~> 2.23'
+   gem 'fabrication', '~> 2.24'
    gem 'fuubar', '~> 2.5'
    gem 'i18n-tasks', '~> 0.9', require: false
    gem 'pry-byebug', '~> 3.9'

diff --cc Gemfile.lock
Simple merge

diff --cc app/helpers/application_helper.rb
Simple merge

diff --cc app/services/fan_out_on_write_service.rb
Simple merge

diff --cc config/environments/production.rb
index b72d1b3426589f28d8c6c83cb181631a099516ef,7fe3810406a7ecad0f9688ffa38b3a42c38c9680..ce3c41799f2aaf350a44db050d86f2021bc85209
--- 1/config/environments/production.rb
--- 2/config/environments/production.rb
+++ b/config/environments/production.rb
@@@ -115,14 -115,11 +115,13 @@@ Rails.application.configure d
    config.action_mailer.delivery_method = ENV.fetch('SMTP_DELIVERY_METHOD', 'smtp').to_sym
  
    config.action_dispatch.default_headers = {
 -    'Server'                 => 'Mastodon',
 -    'X-Frame-Options'        => 'DENY',
 -    'X-Content-Type-Options' => 'nosniff',
 -    'X-XSS-Protection'       => '0',
 -    'Permissions-Policy'     => 'interest-cohort=()',
 +    'Server'                  => 'Mastodon',
 +    'X-Frame-Options'         => 'DENY',
 +    'X-Content-Type-Options'  => 'nosniff',
-     'X-XSS-Protection'        => '1; mode=block',
++    'X-XSS-Protection'        => '0',
 +    'Permissions-Policy'      => 'interest-cohort=()',
 +    'Referrer-Policy'         => 'same-origin',
-     'Strict-Transport-Security' => 'max-age=63072000; includeSubDomains; preload',
 +    'X-Clacks-Overhead' => 'GNU Natalie Nguyen'
    }
  
    config.x.otp_secret = ENV.fetch('OTP_SECRET')

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge