diff options
| author | Henry Jameson <me@hjkos.com> | 2024-05-22 15:20:42 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2024-05-22 15:20:42 +0300 |
| commit | eb27f1205b7bf077b81d698d24c2be656cc59023 (patch) | |
| tree | 4e7f9d7c7651c20371cdd60fdaa50a5a0a0de1c7 /tools | |
| parent | daa39b6e8fd0a940615064436c510bedb205dbad (diff) | |
| parent | 51709ad31893714d98bf7c05cd37d1d07fde65ca (diff) | |
Merge branch 'scrobbles-age' of ssh://git.pleroma.social:2222/pleroma/pleroma-fe into scrobbles-age
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/check-changelog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/check-changelog b/tools/check-changelog index 848a9743..9b3ff37f 100644 --- a/tools/check-changelog +++ b/tools/check-changelog @@ -6,7 +6,7 @@ git remote add upstream https://git.pleroma.social/pleroma/pleroma-fe.git git fetch upstream ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}:refs/remotes/upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME git diff --raw --no-renames upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \ - grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\)$' + grep ' A\t' | grep '\.\(skip\|add\|remove\|change\|fix\|security\)$' ret=$? if [ $ret -eq 0 ]; then |