Merge branch 'deps-changelog-revert' into 'develop'

Revert "Support a new changelog entry type: deps"

See merge request pleroma/pleroma!4071

changelog.d/bandit.change

@@ -0,0 +1 @@
+Support Bandit as an alternative to Cowboy for the HTTP server. 

changelog.d/bandit.deps

@@ -1 +0,0 @@
-Support Bandit as an alternative to Cowboy for the HTTP server

changelog.d/eblurhash.deps

@@ -1 +0,0 @@
-Replaced eblurhash with rinpatch_blurhash

changelog.d/exile.deps

@@ -1 +0,0 @@
-Add exile to replace custom process streaming implementation for calls to ffmpeg

changelog.d/floki.deps

@@ -1 +0,0 @@
-Update Floki to 0.3.5

changelog.d/http_signatures.deps

@@ -1 +0,0 @@
-Update http-signatures to 0.1.2

changelog.d/phoenix.deps

@@ -1 +0,0 @@
-Update Phoenix to 1.7.3

changelog.d/vix.deps

@@ -1 +0,0 @@
-Add Vix for image processing with libvips to replace some usage of ImageMagick

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

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/*