diff options
| author | feld <feld@feld.me> | 2023-11-08 14:12:33 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2023-11-08 14:12:33 +0000 |
| commit | cfc01a660a7b47578d0b163272ca6cd84d50890a (patch) | |
| tree | c00bfdcb62fd263802c8e099731abbc668852702 /tools | |
| parent | 11c520607fcb2bf5b8323d1b22b3123acf12efe1 (diff) | |
| parent | e1bc95ae6eb7a5474433a25268617277b3c9e85b (diff) | |
| download | pleroma-cfc01a660a7b47578d0b163272ca6cd84d50890a.tar.gz pleroma-cfc01a660a7b47578d0b163272ca6cd84d50890a.zip | |
Merge branch 'changelogd-change' into 'develop'
changelogd: Support a type called "change"
See merge request pleroma/pleroma!3970
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 60692033f..64e59ae7f 100644 --- a/tools/check-changelog +++ b/tools/check-changelog @@ -6,7 +6,7 @@ git remote add upstream https://git.pleroma.social/pleroma/pleroma.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\|fix\|security|change\)$' ret=$? if [ $ret -eq 0 ]; then |