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

diff --cc Gemfile.lock
Simple merge

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
Simple merge

diff --cc app/javascript/mastodon/locales/pl.json
Simple merge

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

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

diff --cc app/views/admin/reports/show.html.haml
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc spec/models/status_spec.rb
Simple merge

diff --cc yarn.lock
Simple merge