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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index 0f32a76b7d5b45ef14d009584367d355edcdf983,a62305dc05072f70ee8a779a7ed1a3cd9778ac91..9dc12a8516676f1bd6ba3900e44919e314542761
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -768,12 -804,11 +805,12 @@@ DEPENDENCIE
    rack (~> 2.2.3)
    rack-attack (~> 6.5)
    rack-cors (~> 1.1)
-   rails (~> 5.2.4.5)
+   rails (~> 6.1.3)
    rails-controller-testing (~> 1.0)
-   rails-i18n (~> 5.1)
+   rails-i18n (~> 6.0)
    rails-settings-cached (~> 0.6)
    rdf-normalize (~> 0.4)
 +  redcarpet (~> 3.5)
    redis (~> 4.2)
    redis-namespace (~> 1.8)
    rqrcode (~> 1.2)

diff --cc app/controllers/application_controller.rb
Simple merge

diff --cc app/javascript/mastodon/features/compose/components/compose_form.js
Simple merge

diff --cc app/lib/activitypub/activity/create.rb
Simple merge

diff --cc app/lib/feed_manager.rb
Simple merge

diff --cc app/lib/settings/scoped_settings.rb
Simple merge

diff --cc app/models/user.rb
Simple merge

diff --cc app/views/layouts/application.html.haml
index 32681773f8895f69c77b8da9383058af544bc607,436024ee35e46910aefd335a7455193ca7a93281..3daaf93a92d3b1d421a0aef2da20d23b86ecd879
--- 1/app/views/layouts/application.html.haml
--- 2/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@@ -32,15 -30,11 +32,15 @@@
  
      = stylesheet_link_tag '/inert.css', skip_pipeline: true, media: 'all', id: 'inert-style'
  
 +    = yield :header_tags
 +
 +    -#  These must come after :header_tags to ensure our initial state has been defined.
 +    = render partial: 'layouts/theme', object: @core
 +    = render partial: 'layouts/theme', object: @theme
 +
      - if Setting.custom_css.present?
-       = stylesheet_link_tag custom_css_path, media: 'all'
+       = stylesheet_link_tag custom_css_path, host: request.host, media: 'all'
  
 -    = yield :header_tags
 -
    %body{ class: body_classes }
      = content_for?(:content) ? yield(:content) : yield
  

diff --cc config/environments/production.rb
Simple merge

diff --cc config/initializers/content_security_policy.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc spec/controllers/api/v1/accounts/credentials_controller_spec.rb
Simple merge

diff --cc spec/controllers/application_controller_spec.rb
Simple merge

diff --cc spec/lib/activitypub/activity/create_spec.rb
Simple merge

diff --cc streaming/index.js
Simple merge

diff --cc yarn.lock
Simple merge