From bbf953fff8e9f35d4f1d68520887d0dc88d6fa86 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Wed, 21 Feb 2024 13:24:02 +0000
Subject: [PATCH] 5.2.0

---
 CHANGELOG.md            | 30 ++++++++++++++++++++++++++++++
 changelog.d/870.bugfix  |  1 -
 changelog.d/876.feature |  1 -
 changelog.d/879.doc     |  1 -
 changelog.d/882.doc     |  1 -
 changelog.d/889.feature |  1 -
 changelog.d/890.misc    |  1 -
 changelog.d/891.feature |  1 -
 package.json            |  2 +-
 9 files changed, 31 insertions(+), 8 deletions(-)
 delete mode 100644 changelog.d/870.bugfix
 delete mode 100644 changelog.d/876.feature
 delete mode 100644 changelog.d/879.doc
 delete mode 100644 changelog.d/882.doc
 delete mode 100644 changelog.d/889.feature
 delete mode 100644 changelog.d/890.misc
 delete mode 100644 changelog.d/891.feature

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13f18165..52497aa6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+5.2.0 (2024-02-21)
+==================
+
+Features
+--------
+
+- Add command to list feeds in JSON and YAML format to easily export all feeds from a room. ([\#876](https://github.com/matrix-org/matrix-hookshot/issues/876))
+- Mention all assignees when a new issue is created on GitHub. ([\#889](https://github.com/matrix-org/matrix-hookshot/issues/889))
+- Retry failed feed messages. ([\#891](https://github.com/matrix-org/matrix-hookshot/issues/891))
+
+
+Bugfixes
+--------
+
+- Fix widgets failing with "Request timed out". ([\#870](https://github.com/matrix-org/matrix-hookshot/issues/870))
+
+
+Improved Documentation
+----------------------
+
+- Mention new and legacy webhook paths in setup documentation. ([\#879](https://github.com/matrix-org/matrix-hookshot/issues/879))
+- Add troubleshooting page to documentation, to cover common issues. ([\#882](https://github.com/matrix-org/matrix-hookshot/issues/882))
+
+
+Internal Changes
+----------------
+
+- Failing RSS/atom feeds are now backed off before being retried. This should result in a speedup for large public deployments where failing feeds may result in a slowdown. ([\#890](https://github.com/matrix-org/matrix-hookshot/issues/890))
+
+
 5.1.2 (2024-01-02)
 ==================
 
diff --git a/changelog.d/870.bugfix b/changelog.d/870.bugfix
deleted file mode 100644
index 57f22413..00000000
--- a/changelog.d/870.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix widgets failing with "Request timed out".
diff --git a/changelog.d/876.feature b/changelog.d/876.feature
deleted file mode 100644
index 8f5c28a5..00000000
--- a/changelog.d/876.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add command to list feeds in JSON and YAML format to easily export all feeds from a room.
diff --git a/changelog.d/879.doc b/changelog.d/879.doc
deleted file mode 100644
index 482b7e34..00000000
--- a/changelog.d/879.doc
+++ /dev/null
@@ -1 +0,0 @@
-Mention new and legacy webhook paths in setup documentation.
diff --git a/changelog.d/882.doc b/changelog.d/882.doc
deleted file mode 100644
index 4c0be3b5..00000000
--- a/changelog.d/882.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add troubleshooting page to documentation, to cover common issues.
diff --git a/changelog.d/889.feature b/changelog.d/889.feature
deleted file mode 100644
index a8aa104f..00000000
--- a/changelog.d/889.feature
+++ /dev/null
@@ -1 +0,0 @@
-Mention all assignees when a new issue is created on GitHub.
\ No newline at end of file
diff --git a/changelog.d/890.misc b/changelog.d/890.misc
deleted file mode 100644
index 23b8fb1c..00000000
--- a/changelog.d/890.misc
+++ /dev/null
@@ -1 +0,0 @@
-Failing RSS/atom feeds are now backed off before being retried. This should result in a speedup for large public deployments where failing feeds may result in a slowdown.
\ No newline at end of file
diff --git a/changelog.d/891.feature b/changelog.d/891.feature
deleted file mode 100644
index cf53b329..00000000
--- a/changelog.d/891.feature
+++ /dev/null
@@ -1 +0,0 @@
-Retry failed feed messages.
diff --git a/package.json b/package.json
index ac62e7c2..1515ad95 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-hookshot",
-  "version": "5.1.2",
+  "version": "5.2.0",
   "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",
   "main": "lib/app.js",
   "repository": "https://github.com/matrix-org/matrix-hookshot",