logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: c9cd449bba73375c25f9ef4c31caf80d0506ff63
parent 03834454d92a9aa8776e604b5329a23bc8a5430b
Author: Mark Felder <feld@feld.me>
Date:   Fri, 16 Feb 2024 12:51:39 -0500

Revert "Support a new changelog entry type: deps"

This reverts commit 4648997a1017da68dcf5235e527e861f2c85cf91.

Diffstat:

Mtools/check-changelog2+-
Mtools/collect-changelog1-
2 files changed, 1 insertion(+), 2 deletions(-)

diff --git 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 '\.\(add\|change\|deps\|fix\|remove\|security\)$' + grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\|change\)$' ret=$? if [ $ret -eq 0 ]; then diff --git a/tools/collect-changelog b/tools/collect-changelog @@ -23,6 +23,5 @@ collectType change Changed collectType add Added collectType fix Fixed collectType remove Removed -collectType deps Dependencies rm changelog.d/*