diff options
author | marcin mikołajczak <git@mkljczk.pl> | 2024-03-07 13:13:49 +0100 |
---|---|---|
committer | marcin mikołajczak <git@mkljczk.pl> | 2024-03-07 13:13:49 +0100 |
commit | b7c625db0f8090ce11c75a19fbaee8f985b966c3 (patch) | |
tree | 0d631e593dd195014fc35d7203f82f331b35aff0 /tools/check-changelog | |
parent | 47ce33a90d09878d5231ce9654853ebcd1b88c08 (diff) | |
parent | 8298b326a7a3081be262c73f734dfe3082962e83 (diff) | |
download | pleroma-b7c625db0f8090ce11c75a19fbaee8f985b966c3.tar.gz pleroma-b7c625db0f8090ce11c75a19fbaee8f985b966c3.zip |
Merge remote-tracking branch 'origin/develop' into link-verification
Diffstat (limited to 'tools/check-changelog')
-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..d053ed577 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 |