diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2023-12-22 13:29:56 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2023-12-22 13:29:56 +0100 |
| commit | 28e5e65676ea08ae9e329d51648baf06dcf950c0 (patch) | |
| tree | fd0b04e34a2f3df53b35ed5c3eb8301ad242ede6 /tools/check-changelog | |
| parent | 39d3df86c8e2ee05d409865ebc866c543a604ad9 (diff) | |
| parent | 5f1d70736711275ac9f0c95e5ada4cb2f1a96e11 (diff) | |
| download | pleroma-28e5e65676ea08ae9e329d51648baf06dcf950c0.tar.gz pleroma-28e5e65676ea08ae9e329d51648baf06dcf950c0.zip | |
Merge remote-tracking branch 'origin/develop' into webfinger-fix
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
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 |