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

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our README.

diff --cc .github/workflows/build-image.yml
index 281fa33b73947458732f13a19129162f9356c938,bae18548494f3d08dd174899582f24f8a4e9ae01..eccef8700e1b6a67845b18f36c5e120226116f3d
--- 1/.github/workflows/build-image.yml
--- 2/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@@ -26,12 -25,12 +26,12 @@@ jobs
        - uses: docker/metadata-action@v3
          id: meta
          with:
 -          images: tootsuite/mastodon
 +          images: ghcr.io/${{ github.repository_owner }}/mastodon
            flavor: |
 -            latest=auto
 +            latest=true
            tags: |
              type=edge,branch=main
-             type=semver,pattern={{ raw }}
+             type=match,pattern=v(.*),group=0
              type=ref,event=pr
        - uses: docker/build-push-action@v2
          with:

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/api/v1/notifications_controller.rb
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/models/status.rb
Simple merge

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

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

diff --cc lib/mastodon/version.rb
Simple merge

diff --cc package.json
index 463d47a8a2020f948cddb75c62e27ee22de2f397,d42c92cedae495fc5162649ffcba14672dca2191..11be90e44e2c6c59a18e3f383327835602eb216d
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -67,15 -66,14 +67,15 @@@
      "@babel/plugin-transform-runtime": "^7.17.0",
      "@babel/preset-env": "^7.16.11",
      "@babel/preset-react": "^7.16.7",
-     "@babel/runtime": "^7.17.2",
+     "@babel/runtime": "^7.17.7",
      "@gamestdio/websocket": "^0.3.2",
      "@github/webauthn-json": "^0.5.7",
-     "@rails/ujs": "^6.1.4",
+     "@rails/ujs": "^6.1.5",
      "array-includes": "^3.1.4",
 +    "atrament": "0.2.4",
      "arrow-key-navigation": "^1.2.0",
      "autoprefixer": "^9.8.8",
-     "axios": "^0.26.0",
+     "axios": "^0.26.1",
      "babel-loader": "^8.2.3",
      "babel-plugin-lodash": "^3.3.4",
      "babel-plugin-preval": "^5.1.0",

diff --cc yarn.lock
Simple merge