Merge branch 'release/2.6.x' into 'master'

merge 2.6.x to master since 2.6.1 release

See merge request pleroma/pleroma-fe!1874

1 files changed, 27 insertions, 0 deletions

diff --git a/tools/collect-changelog b/tools/collect-changelog
new file mode 100755
index 00000000..1e12d564
--- /dev/null
+++ b/tools/collect-changelog
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+collectType() {
+    local suffix="$1"
+    local header="$2"
+    local printed=0
+    for file in changelog.d/*."$suffix"; do
+        if [ '!' -f "$file" ]; then
+            continue
+        fi
+        if [ "$printed" = 0 ]; then
+            echo
+            echo "### $header"
+            printed=1
+        fi
+        # Normalize any trailing newlines/spaces, etc.
+        echo "- $(cat "$file")"
+    done
+}
+
+collectType security Security
+collectType change Changed
+collectType add Added
+collectType fix Fixed
+collectType remove Removed
+
+rm changelog.d/*