mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-22 16:16:34 +00:00
Merge branch 'deps-changelog-revert' into 'develop'
Revert "Support a new changelog entry type: deps" See merge request pleroma/pleroma!4071
This commit is contained in:
commit
0fbec6b532
11 changed files with 2 additions and 9 deletions
1
changelog.d/bandit.change
Normal file
1
changelog.d/bandit.change
Normal file
|
@ -0,0 +1 @@
|
|||
Support Bandit as an alternative to Cowboy for the HTTP server.
|
|
@ -1 +0,0 @@
|
|||
Support Bandit as an alternative to Cowboy for the HTTP server
|
|
@ -1 +0,0 @@
|
|||
Replaced eblurhash with rinpatch_blurhash
|
|
@ -1 +0,0 @@
|
|||
Add exile to replace custom process streaming implementation for calls to ffmpeg
|
|
@ -1 +0,0 @@
|
|||
Update Floki to 0.3.5
|
|
@ -1 +0,0 @@
|
|||
Update http-signatures to 0.1.2
|
|
@ -1 +0,0 @@
|
|||
Update Phoenix to 1.7.3
|
|
@ -1 +0,0 @@
|
|||
Add Vix for image processing with libvips to replace some usage of ImageMagick
|
|
@ -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
|
||||
|
|
|
@ -23,6 +23,5 @@ collectType change Changed
|
|||
collectType add Added
|
||||
collectType fix Fixed
|
||||
collectType remove Removed
|
||||
collectType deps Dependencies
|
||||
|
||||
rm changelog.d/*
|
||||
|
|
Loading…
Reference in a new issue