pleroma

commit: 0fbec6b532330e86da9b396f31f9d5dd04990a9e
parent 03834454d92a9aa8776e604b5329a23bc8a5430b
Author: feld <feld@feld.me>
Date:   Fri, 16 Feb 2024 17:53:52 +0000

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

Revert "Support a new changelog entry type: deps"

See merge request pleroma/pleroma!4071
Diffstat:
A
changelog.d/bandit.change
1
+
D
changelog.d/bandit.deps
1
-
D
changelog.d/eblurhash.deps
1
-
D
changelog.d/exile.deps
1
-
D
changelog.d/floki.deps
1
-
D
changelog.d/http_signatures.deps
1
-
D
changelog.d/phoenix.deps
1
-
R
changelog.d/promex.deps -> changelog.d/promex.change
0

D
changelog.d/vix.deps
1
-
M
tools/check-changelog
2
+-
M
tools/collect-changelog
1
-

11 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/changelog.d/bandit.change b/changelog.d/bandit.change
@@ -0,0 +1 @@
+Support Bandit as an alternative to Cowboy for the HTTP server. 
diff --git a/changelog.d/bandit.deps b/changelog.d/bandit.deps
@@ -1 +0,0 @@
-Support Bandit as an alternative to Cowboy for the HTTP server
diff --git a/changelog.d/eblurhash.deps b/changelog.d/eblurhash.deps
@@ -1 +0,0 @@
-Replaced eblurhash with rinpatch_blurhash
diff --git a/changelog.d/exile.deps b/changelog.d/exile.deps
@@ -1 +0,0 @@
-Add exile to replace custom process streaming implementation for calls to ffmpeg
diff --git a/changelog.d/floki.deps b/changelog.d/floki.deps
@@ -1 +0,0 @@
-Update Floki to 0.3.5
diff --git a/changelog.d/http_signatures.deps b/changelog.d/http_signatures.deps
@@ -1 +0,0 @@
-Update http-signatures to 0.1.2
diff --git a/changelog.d/phoenix.deps b/changelog.d/phoenix.deps
@@ -1 +0,0 @@
-Update Phoenix to 1.7.3
diff --git a/changelog.d/promex.deps b/changelog.d/promex.change
diff --git a/changelog.d/vix.deps b/changelog.d/vix.deps
@@ -1 +0,0 @@
-Add Vix for image processing with libvips to replace some usage of ImageMagick
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/*