2.4.0-rc1

matrix-org · Nov 20, 2020 · 36ea016 · 36ea016
1 parent 1f701e0
commit 36ea016
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+ 2.4.0-rc1 (2020-11-20)
+=======================
+
+Features
+--------
+
+- Add function `registerMetrics` to `MembershipQueue` to track metrics. ([\#276](https://github.com/matrix-org/matrix-appservice-bridge/issues/276))
+- Add `defaultTtl` option to `MembershipQueue` to expire membership that is too old. ([\#277](https://github.com/matrix-org/matrix-appservice-bridge/issues/277))
+- Logs from `matrix-js-sdk` will now be passed through the bridge `Logger` to keep logging in one place. ([\#280](https://github.com/matrix-org/matrix-appservice-bridge/issues/280))
+
+
+Bugfixes
+--------
+
+- Add a script to automatically generate documentation for a release. ([\#275](https://github.com/matrix-org/matrix-appservice-bridge/issues/275))
+- Fix a bug where `intent.uploadContent` would return the full JSON response of an upload rather than it's MXC url. ([\#279](https://github.com/matrix-org/matrix-appservice-bridge/issues/279))
+
+
 2.3.1 (2020-11-06)
 =======================
 

diff --git a/changelog.d/275.bugfix b/changelog.d/275.bugfix
diff --git a/changelog.d/276.feature b/changelog.d/276.feature
diff --git a/changelog.d/277.feature b/changelog.d/277.feature
diff --git a/changelog.d/279.bugfix b/changelog.d/279.bugfix
diff --git a/changelog.d/280.feature b/changelog.d/280.feature
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-bridge",
-  "version": "2.3.1",
+  "version": "2.4.0-rc1",
   "description": "Bridging infrastructure for Matrix Application Services",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",