From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 23 Feb 2022 17:13:12 +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=3d25fe042679e7f5b9095983feb22f46e24c3033;p=mastodon.git

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

Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed the workflow a bit.
  Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
  Ported the upstream changes while still pushing to ghcr.
---

3d25fe042679e7f5b9095983feb22f46e24c3033
diff --cc .github/workflows/build-image.yml
index 2d1df7211,f8b4a751d..281fa33b7
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@@ -19,9 -19,9 +19,10 @@@ jobs
        - uses: docker/setup-buildx-action@v1
        - uses: docker/login-action@v1
          with:
 -          username: ${{ secrets.DOCKERHUB_USERNAME }}
 -          password: ${{ secrets.DOCKERHUB_TOKEN }}
 +          registry: ghcr.io
 +          username: ${{ github.repository_owner }}
 +          password: ${{ secrets.GITHUB_TOKEN }}
+         if: github.event_name != 'pull_request'
        - uses: docker/metadata-action@v3
          id: meta
          with:
diff --cc config/i18n-tasks.yml
index e09f4262b,7f879b1aa..a3d7baecd
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@@ -59,9 -59,9 +59,10 @@@ ignore_unused
    - 'errors.429'
    - 'admin.accounts.roles.*'
    - 'admin.action_logs.actions.*'
 +  - 'themes.*'
    - 'statuses.attached.*'
    - 'move_handler.carry_{mutes,blocks}_over_text'
+   - 'notification_mailer.*'
  
  ignore_inconsistent_interpolations:
    - '*.one'