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

Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.

diff --cc .github/workflows/build-image.yml
Simple merge

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

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

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

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

diff --cc app/views/admin/accounts/index.html.haml
Simple merge

diff --cc app/views/admin/statuses/index.html.haml
Simple merge

diff --cc config/i18n-tasks.yml
Simple merge

diff --cc package.json
Simple merge

diff --cc streaming/index.js
Simple merge

diff --cc yarn.lock
Simple merge