diff options
| author | Marcin Mikołajczak <git@mkljczk.pl> | 2023-11-08 20:46:57 +0100 |
|---|---|---|
| committer | Marcin Mikołajczak <git@mkljczk.pl> | 2023-11-08 20:46:57 +0100 |
| commit | 1e9333a9aa5f15dd9cbea826ee42561e4a9d12c3 (patch) | |
| tree | 923fa49e845b97b99c65855de3113b444253e10c /tools/check-changelog | |
| parent | c6cedbb8106a16527e48ac8ae03907e1d66c5a1b (diff) | |
| parent | a51f3937eef0c6add91234863d5f936c59830d88 (diff) | |
| download | pleroma-1e9333a9aa5f15dd9cbea826ee42561e4a9d12c3.tar.gz pleroma-1e9333a9aa5f15dd9cbea826ee42561e4a9d12c3.zip | |
Merge remote-tracking branch 'origin/develop' into instance-v2
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 |