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

diff --cc .github/workflows/build-image.yml
index 880fdfac940a7ad6a1f79a0926512aac1679b6d6,0fa28aca16dc7dd5a7351c04473f220d76492e7b..b3a8d5105bf1aad2b94202ac7ee5d5ab1d7239e9
--- 1/.github/workflows/build-image.yml
--- 2/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@@ -36,8 -38,8 +39,8 @@@ jobs
        - uses: docker/build-push-action@v2
          with:
            context: .
-           platforms: linux/amd64,linux/arm64
+           platforms: ${{ matrix.os }}
            push: ${{ github.event_name != 'pull_request' }}
            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
Simple merge

diff --cc Gemfile.lock
Simple merge

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

diff --cc config/routes.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge