summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2021-01-20 08:56:25 -0500
committerPatrick Cloke <patrickc@matrix.org>2021-01-20 08:56:25 -0500
commit7e072d38b15d38553028d25693561f4c00fc2b48 (patch)
tree583fd0dcda0caab80d956b86a37c26630035683d
parentTighten the restrictions on `idp_id` (#9177) (diff)
downloadsynapse-7e072d38b15d38553028d25693561f4c00fc2b48.tar.xz
Re-run towncrier.
-rw-r--r--CHANGES.md3
-rw-r--r--changelog.d/9154.feature1
-rw-r--r--changelog.d/9159.feature1
-rw-r--r--changelog.d/9177.feature1
4 files changed, 2 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md
index ef3a674190..fa6c67489f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,8 +4,9 @@ Synapse 1.26.0rc1 (2021-01-20)
 Features
 --------
 
-- Add support for multiple SSO Identity Providers. ([\#9015](https://github.com/matrix-org/synapse/issues/9015), [\#9017](https://github.com/matrix-org/synapse/issues/9017), [\#9036](https://github.com/matrix-org/synapse/issues/9036), [\#9067](https://github.com/matrix-org/synapse/issues/9067), [\#9081](https://github.com/matrix-org/synapse/issues/9081), [\#9082](https://github.com/matrix-org/synapse/issues/9082), [\#9105](https://github.com/matrix-org/synapse/issues/9105), [\#9107](https://github.com/matrix-org/synapse/issues/9107), [\#9109](https://github.com/matrix-org/synapse/issues/9109), [\#9110](https://github.com/matrix-org/synapse/issues/9110), [\#9127](https://github.com/matrix-org/synapse/issues/9127), [\#9153](https://github.com/matrix-org/synapse/issues/9153))
+- Add support for multiple SSO Identity Providers. ([\#9015](https://github.com/matrix-org/synapse/issues/9015), [\#9017](https://github.com/matrix-org/synapse/issues/9017), [\#9036](https://github.com/matrix-org/synapse/issues/9036), [\#9067](https://github.com/matrix-org/synapse/issues/9067), [\#9081](https://github.com/matrix-org/synapse/issues/9081), [\#9082](https://github.com/matrix-org/synapse/issues/9082), [\#9105](https://github.com/matrix-org/synapse/issues/9105), [\#9107](https://github.com/matrix-org/synapse/issues/9107), [\#9109](https://github.com/matrix-org/synapse/issues/9109), [\#9110](https://github.com/matrix-org/synapse/issues/9110), [\#9127](https://github.com/matrix-org/synapse/issues/9127), [\#9153](https://github.com/matrix-org/synapse/issues/9153), [\#9154](https://github.com/matrix-org/synapse/issues/9154), [\#9177](https://github.com/matrix-org/synapse/issues/9177))
 - During user-interactive authentication via single-sign-on, give a better error if the user uses the wrong account on the SSO IdP. ([\#9091](https://github.com/matrix-org/synapse/issues/9091))
+- Give the `public_baseurl` a default value, if it is not explicitly set in the configuration file. ([\#9159](https://github.com/matrix-org/synapse/issues/9159))
 - Improve performance when calculating ignored users in large rooms. ([\#9024](https://github.com/matrix-org/synapse/issues/9024))
 - Implement [MSC2176](https://github.com/matrix-org/matrix-doc/pull/2176) in an experimental room version. ([\#8984](https://github.com/matrix-org/synapse/issues/8984))
 - Add an admin API for protecting local media from quarantine. ([\#9086](https://github.com/matrix-org/synapse/issues/9086))
diff --git a/changelog.d/9154.feature b/changelog.d/9154.feature
deleted file mode 100644
index 01a24dcf49..0000000000
--- a/changelog.d/9154.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for multiple SSO Identity Providers.
diff --git a/changelog.d/9159.feature b/changelog.d/9159.feature
deleted file mode 100644
index b7748757de..0000000000
--- a/changelog.d/9159.feature
+++ /dev/null
@@ -1 +0,0 @@
-Give the `public_baseurl` a default value, if it is not explicitly set in the configuration file.
diff --git a/changelog.d/9177.feature b/changelog.d/9177.feature
deleted file mode 100644
index 01a24dcf49..0000000000
--- a/changelog.d/9177.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for multiple SSO Identity Providers.