From 2a093562ce248dffcb50d7a06b9dbaf5364ddeaf Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Fri, 16 Sep 2022 14:30:57 +0100
Subject: [PATCH] 2.2.0

---
 CHANGELOG.md            | 24 ++++++++++++++++++++++++
 changelog.d/473.bugfix  |  1 -
 changelog.d/478.misc    |  1 -
 changelog.d/480.feature |  1 -
 changelog.d/481.bugfix  |  1 -
 changelog.d/484.feature |  1 -
 changelog.d/489.misc    |  1 -
 package.json            |  2 +-
 8 files changed, 25 insertions(+), 7 deletions(-)
 delete mode 100644 changelog.d/473.bugfix
 delete mode 100644 changelog.d/478.misc
 delete mode 100644 changelog.d/480.feature
 delete mode 100644 changelog.d/481.bugfix
 delete mode 100644 changelog.d/484.feature
 delete mode 100644 changelog.d/489.misc

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7192750a1..7e53593dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,27 @@
+2.2.0 (2022-09-16)
+==================
+
+Features
+--------
+
+- Ready/draft state changes for GitLab merge requests are now reported. ([\#480](https://github.com/matrix-org/matrix-hookshot/issues/480))
+- Merge GitLab MR approvals and comments into one message. ([\#484](https://github.com/matrix-org/matrix-hookshot/issues/484))
+
+
+Bugfixes
+--------
+
+- Log noisy "Got GitHub webhook event" log line at debug level. ([\#473](https://github.com/matrix-org/matrix-hookshot/issues/473))
+- Fix Figma service not being able to create new webhooks on startup, causing a crash. ([\#481](https://github.com/matrix-org/matrix-hookshot/issues/481))
+
+
+Internal Changes
+----------------
+
+- Fix a bug where the bridge can crash when JSON logging is enabled. ([\#478](https://github.com/matrix-org/matrix-hookshot/issues/478))
+- Update codemirror and remove unused font. ([\#489](https://github.com/matrix-org/matrix-hookshot/issues/489))
+
+
 2.1.2 (2022-09-03)
 ==================
 
diff --git a/changelog.d/473.bugfix b/changelog.d/473.bugfix
deleted file mode 100644
index 5cadb1d11..000000000
--- a/changelog.d/473.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Log noisy "Got GitHub webhook event" log line at debug level.
diff --git a/changelog.d/478.misc b/changelog.d/478.misc
deleted file mode 100644
index 5e5463086..000000000
--- a/changelog.d/478.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where the bridge can crash when JSON logging is enabled.
diff --git a/changelog.d/480.feature b/changelog.d/480.feature
deleted file mode 100644
index 37e61f68b..000000000
--- a/changelog.d/480.feature
+++ /dev/null
@@ -1 +0,0 @@
-Ready/draft state changes for GitLab merge requests are now reported.
diff --git a/changelog.d/481.bugfix b/changelog.d/481.bugfix
deleted file mode 100644
index 96f3c4891..000000000
--- a/changelog.d/481.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix Figma service not being able to create new webhooks on startup, causing a crash.
\ No newline at end of file
diff --git a/changelog.d/484.feature b/changelog.d/484.feature
deleted file mode 100644
index 94f0969fe..000000000
--- a/changelog.d/484.feature
+++ /dev/null
@@ -1 +0,0 @@
-Merge GitLab MR approvals and comments into one message.
diff --git a/changelog.d/489.misc b/changelog.d/489.misc
deleted file mode 100644
index 6a0dbdafe..000000000
--- a/changelog.d/489.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update codemirror and remove unused font.
\ No newline at end of file
diff --git a/package.json b/package.json
index 9599b2483..37e26451e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-hookshot",
-  "version": "2.1.2",
+  "version": "2.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",