Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
This commit is contained in:
Claire
2024-11-24 16:46:28 +01:00
parent e8c108d270 e68b26c8df
commit 6374937147
173 changed files with 1465 additions and 936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build-container-image.yml vendored
View File

@@ -92,6 +92,7 @@ jobs:
build-args: |
MASTODON_VERSION_PRERELEASE=${{ inputs.version_prerelease }}
MASTODON_VERSION_METADATA=${{ inputs.version_metadata }}
SOURCE_COMMIT=${{ github.sha }}
platforms: ${{ inputs.platforms }}
provenance: false
builder: ${{ steps.buildx.outputs.name || steps.buildx-native.outputs.name }}