diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-16 23:12:59 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-03-16 23:12:59 +0100 |
| commit | 193250556cb4e6b1b3e2f9bd1ac023b290176fd4 (patch) | |
| tree | 3bd6148ff028b8fe089cae9d805a7e587eaeec11 /.github | |
| parent | f5daa20f2a90098c9d689c5ec9d95ce9887b3a33 (diff) | |
| parent | 681dcd3fa35e886a21853ca829ff1be7f220e83a (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build-image.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 97a363d1e..25675c218 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -49,7 +49,7 @@ jobs: platforms: linux/amd64,linux/arm64 provenance: false builder: ${{ steps.buildx.outputs.name }} - push: ${{ github.event_name != 'pull_request' }} + push: ${{ github.repository == 'mastodon/mastodon' && github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha |