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

diff --cc Gemfile
index ae4bd0d87460d7ef4cbc349f09463325b9ce3fde,880bb8b517e22d4adc0d5c0d74f82708d1fb7d7a..8a77c1bf6cac79525935d9109eab740216cba231
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -103,10 -103,8 +103,10 @@@ gem 'json-ld
  gem 'json-ld-preloaded', '~> 3.1'
  gem 'rdf-normalize', '~> 0.4'
  
 +gem 'redcarpet', '~> 3.5'
 +
  group :development, :test do
-   gem 'fabrication', '~> 2.21'
+   gem 'fabrication', '~> 2.22'
    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/controllers/admin/dashboard_controller.rb
Simple merge

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge