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

Conflicts:
- `CHANGELOG.md`:
  Upstream added newlines.
  Conflicts are because the CHANGELOG was independently merged from 3.4.6 on
  last security update.
  Took upstream's version.
- `app/helpers/context_helper.rb`:
  Conflicts because of extra vocabulary in glitch-soc. The conflicts were
  actually handled in last security merge.
  Kept our version.

diff --cc .github/workflows/build-image.yml
index d3eeb9368cabab6291448735aaa6d2dd3ddad129,0aaea6b1fe26fbe62b72e619dda7b95f1434cae7..5b7f2481eae9503a34a71709dc1f245b5b85446b
--- 1/.github/workflows/build-image.yml
--- 2/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@@ -29,7 -29,8 +30,8 @@@ jobs
        - uses: docker/build-push-action@v2
          with:
            context: .
+           platforms: linux/amd64,linux/arm64
            push: true
            tags: ${{ steps.meta.outputs.tags }}
 -          cache-from: type=registry,ref=tootsuite/mastodon:latest
 +          cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/mastodon:latest
            cache-to: type=inline

diff --cc Gemfile.lock
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge