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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index c49032c42781d5a8176be0378d12f85c93283655,30fe32a222a9bef2627f93d4c23b45a287150a53..198abd8e3fdcb9daf8af93c9d40504f95357683e
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -756,9 -770,9 +771,10 @@@ DEPENDENCIE
    rails-i18n (~> 6.0)
    rails-settings-cached (~> 0.6)
    rdf-normalize (~> 0.4)
 +  redcarpet (~> 3.5)
    redis (~> 4.5)
    redis-namespace (~> 1.8)
+   rexml (~> 3.2)
    rqrcode (~> 2.1)
    rspec-rails (~> 5.0)
    rspec-sidekiq (~> 3.1)

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

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

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

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

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge