diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-03-26 17:13:41 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-03-26 17:13:41 +0000 |
| commit | d7f744d2819343eced508a589d6fad3842686a3e (patch) | |
| tree | b9f87847afea2dac31c007aef1d8dc2b60cf1145 /tools | |
| parent | 23edfe7b918844f8cc2ff5b9b245952092ee1cbf (diff) | |
| parent | c298611af2736b0a0d535b6bb47b2c9025e4069a (diff) | |
Merge branch 'themes3' into 'develop'
Themes 3.0 / Pleroma ISS (Interface Style Sheets) [Side A]
See merge request pleroma/pleroma-fe!1892
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 |
