From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 6 Feb 2022 14:34:42 +0000 (+0100)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=aa832d623ac0812a970ea90440c50fca9a7bb616;p=mastodon.git

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.
---

aa832d623ac0812a970ea90440c50fca9a7bb616
diff --cc .github/workflows/build-image.yml
index d3eeb9368,0aaea6b1f..5b7f2481e
--- a/.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