From 20ffaa72098708b125801402c5258f7cc6163c5b Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Mon, 11 May 2020 14:54:38 +0100
Subject: [PATCH] 1.13.0rc1

---
 CHANGES.md               | 138 +++++++++++++++++++++++++++++++++++++++
 changelog.d/6446.misc    |   1 -
 changelog.d/6573.bugfix  |   1 -
 changelog.d/6634.bugfix  |   1 -
 changelog.d/6639.bugfix  |   1 -
 changelog.d/6881.misc    |   1 -
 changelog.d/6892.doc     |   1 -
 changelog.d/6899.bugfix  |   1 -
 changelog.d/6946.bugfix  |   1 -
 changelog.d/6988.doc     |   1 -
 changelog.d/7006.feature |   1 -
 changelog.d/7009.feature |   1 -
 changelog.d/7010.misc    |   1 -
 changelog.d/7011.misc    |   1 -
 changelog.d/7024.misc    |   1 -
 changelog.d/7040.feature |   1 -
 changelog.d/7051.feature |   1 -
 changelog.d/7068.bugfix  |   1 -
 changelog.d/7089.bugfix  |   1 -
 changelog.d/7091.doc     |   1 -
 changelog.d/7096.feature |   1 -
 changelog.d/7102.feature |   1 -
 changelog.d/7107.doc     |   1 -
 changelog.d/7109.bugfix  |   1 -
 changelog.d/7110.misc    |   1 -
 changelog.d/7115.misc    |   1 -
 changelog.d/7116.misc    |   1 -
 changelog.d/7117.bugfix  |   1 -
 changelog.d/7118.feature |   1 -
 changelog.d/7119.doc     |   1 -
 changelog.d/7120.misc    |   1 -
 changelog.d/7128.misc    |   1 -
 changelog.d/7133.bugfix  |   1 -
 changelog.d/7136.misc    |   1 -
 changelog.d/7137.removal |   1 -
 changelog.d/7141.doc     |   1 -
 changelog.d/7146.misc    |   1 -
 changelog.d/7147.doc     |   1 -
 changelog.d/7150.bugfix  |   1 -
 changelog.d/7151.bugfix  |   1 -
 changelog.d/7152.feature |   1 -
 changelog.d/7153.feature |   1 -
 changelog.d/7155.bugfix  |   1 -
 changelog.d/7157.misc    |   1 -
 changelog.d/7158.misc    |   1 -
 changelog.d/7159.bugfix  |   1 -
 changelog.d/7167.doc     |   1 -
 changelog.d/7171.doc     |   1 -
 changelog.d/7172.misc    |   1 -
 changelog.d/7177.bugfix  |   1 -
 changelog.d/7178.bugfix  |   1 -
 changelog.d/7181.misc    |   1 -
 changelog.d/7183.misc    |   1 -
 changelog.d/7184.misc    |   1 -
 changelog.d/7185.misc    |   1 -
 changelog.d/7186.feature |   1 -
 changelog.d/7187.misc    |   1 -
 changelog.d/7188.misc    |   1 -
 changelog.d/7190.misc    |   1 -
 changelog.d/7191.feature |   1 -
 changelog.d/7192.misc    |   1 -
 changelog.d/7193.misc    |   1 -
 changelog.d/7195.misc    |   1 -
 changelog.d/7199.bugfix  |   1 -
 changelog.d/7203.bugfix  |   1 -
 changelog.d/7207.misc    |   1 -
 changelog.d/7213.misc    |   1 -
 changelog.d/7219.misc    |   1 -
 changelog.d/7225.misc    |   1 -
 changelog.d/7226.misc    |   1 -
 changelog.d/7228.misc    |   1 -
 changelog.d/7230.feature |   1 -
 changelog.d/7233.misc    |   1 -
 changelog.d/7234.doc     |   1 -
 changelog.d/7235.feature |   1 -
 changelog.d/7236.misc    |   1 -
 changelog.d/7237.misc    |   1 -
 changelog.d/7238.doc     |   1 -
 changelog.d/7239.misc    |   1 -
 changelog.d/7240.bugfix  |   1 -
 changelog.d/7241.misc    |   1 -
 changelog.d/7243.misc    |   1 -
 changelog.d/7248.doc     |   1 -
 changelog.d/7249.bugfix  |   1 -
 changelog.d/7251.doc     |   1 -
 changelog.d/7259.bugfix  |   1 -
 changelog.d/7260.bugfix  |   1 -
 changelog.d/7261.misc    |   1 -
 changelog.d/7265.feature |   1 -
 changelog.d/7268.bugfix  |   1 -
 changelog.d/7272.doc     |   1 -
 changelog.d/7274.bugfix  |   1 -
 changelog.d/7278.misc    |   1 -
 changelog.d/7279.feature |   1 -
 changelog.d/7286.misc    |   1 -
 changelog.d/7290.misc    |   1 -
 changelog.d/7291.misc    |   1 -
 changelog.d/7295.misc    |   1 -
 changelog.d/7300.misc    |   1 -
 changelog.d/7302.bugfix  |   1 -
 changelog.d/7303.misc    |   1 -
 changelog.d/7315.feature |   1 -
 changelog.d/7316.bugfix  |   1 -
 changelog.d/7318.misc    |   1 -
 changelog.d/7319.misc    |   1 -
 changelog.d/7321.misc    |   1 -
 changelog.d/7325.feature |   1 -
 changelog.d/7326.misc    |   1 -
 changelog.d/7337.bugfix  |   1 -
 changelog.d/7338.misc    |   1 -
 changelog.d/7341.bugfix  |   1 -
 changelog.d/7343.feature |   1 -
 changelog.d/7344.bugfix  |   1 -
 changelog.d/7352.feature |   1 -
 changelog.d/7357.doc     |   1 -
 changelog.d/7358.bugfix  |   1 -
 changelog.d/7359.misc    |   1 -
 changelog.d/7361.doc     |   1 -
 changelog.d/7363.misc    |   1 -
 changelog.d/7364.misc    |   1 -
 changelog.d/7367.bugfix  |   1 -
 changelog.d/7368.bugfix  |   1 -
 changelog.d/7369.misc    |   1 -
 changelog.d/7378.misc    |   1 -
 changelog.d/7387.bugfix  |   1 -
 changelog.d/7393.bugfix  |   1 -
 changelog.d/7394.misc    |   1 -
 changelog.d/7395.misc    |   1 -
 changelog.d/7401.feature |   1 -
 changelog.d/7404.misc    |   1 -
 changelog.d/7408.misc    |   1 -
 changelog.d/7420.misc    |   1 -
 changelog.d/7421.misc    |   1 -
 changelog.d/7422.feature |   1 -
 changelog.d/7423.misc    |   1 -
 changelog.d/7426.misc    |   1 -
 changelog.d/7427.feature |   1 -
 changelog.d/7439.feature |   1 -
 changelog.d/7442.misc    |   1 -
 changelog.d/7446.feature |   1 -
 changelog.d/7450.feature |   1 -
 changelog.d/7454.feature |   1 -
 changelog.d/7455.bugfix  |   1 -
 synapse/__init__.py      |   2 +-
 144 files changed, 139 insertions(+), 143 deletions(-)
 delete mode 100644 changelog.d/6446.misc
 delete mode 100644 changelog.d/6573.bugfix
 delete mode 100644 changelog.d/6634.bugfix
 delete mode 100644 changelog.d/6639.bugfix
 delete mode 100644 changelog.d/6881.misc
 delete mode 100644 changelog.d/6892.doc
 delete mode 100644 changelog.d/6899.bugfix
 delete mode 100644 changelog.d/6946.bugfix
 delete mode 100644 changelog.d/6988.doc
 delete mode 100644 changelog.d/7006.feature
 delete mode 100644 changelog.d/7009.feature
 delete mode 100644 changelog.d/7010.misc
 delete mode 100644 changelog.d/7011.misc
 delete mode 100644 changelog.d/7024.misc
 delete mode 100644 changelog.d/7040.feature
 delete mode 100644 changelog.d/7051.feature
 delete mode 100644 changelog.d/7068.bugfix
 delete mode 100644 changelog.d/7089.bugfix
 delete mode 100644 changelog.d/7091.doc
 delete mode 100644 changelog.d/7096.feature
 delete mode 100644 changelog.d/7102.feature
 delete mode 100644 changelog.d/7107.doc
 delete mode 100644 changelog.d/7109.bugfix
 delete mode 100644 changelog.d/7110.misc
 delete mode 100644 changelog.d/7115.misc
 delete mode 100644 changelog.d/7116.misc
 delete mode 100644 changelog.d/7117.bugfix
 delete mode 100644 changelog.d/7118.feature
 delete mode 100644 changelog.d/7119.doc
 delete mode 100644 changelog.d/7120.misc
 delete mode 100644 changelog.d/7128.misc
 delete mode 100644 changelog.d/7133.bugfix
 delete mode 100644 changelog.d/7136.misc
 delete mode 100644 changelog.d/7137.removal
 delete mode 100644 changelog.d/7141.doc
 delete mode 100644 changelog.d/7146.misc
 delete mode 100644 changelog.d/7147.doc
 delete mode 100644 changelog.d/7150.bugfix
 delete mode 100644 changelog.d/7151.bugfix
 delete mode 100644 changelog.d/7152.feature
 delete mode 100644 changelog.d/7153.feature
 delete mode 100644 changelog.d/7155.bugfix
 delete mode 100644 changelog.d/7157.misc
 delete mode 100644 changelog.d/7158.misc
 delete mode 100644 changelog.d/7159.bugfix
 delete mode 100644 changelog.d/7167.doc
 delete mode 100644 changelog.d/7171.doc
 delete mode 100644 changelog.d/7172.misc
 delete mode 100644 changelog.d/7177.bugfix
 delete mode 100644 changelog.d/7178.bugfix
 delete mode 100644 changelog.d/7181.misc
 delete mode 100644 changelog.d/7183.misc
 delete mode 100644 changelog.d/7184.misc
 delete mode 100644 changelog.d/7185.misc
 delete mode 100644 changelog.d/7186.feature
 delete mode 100644 changelog.d/7187.misc
 delete mode 100644 changelog.d/7188.misc
 delete mode 100644 changelog.d/7190.misc
 delete mode 100644 changelog.d/7191.feature
 delete mode 100644 changelog.d/7192.misc
 delete mode 100644 changelog.d/7193.misc
 delete mode 100644 changelog.d/7195.misc
 delete mode 100644 changelog.d/7199.bugfix
 delete mode 100644 changelog.d/7203.bugfix
 delete mode 100644 changelog.d/7207.misc
 delete mode 100644 changelog.d/7213.misc
 delete mode 100644 changelog.d/7219.misc
 delete mode 100644 changelog.d/7225.misc
 delete mode 100644 changelog.d/7226.misc
 delete mode 100644 changelog.d/7228.misc
 delete mode 100644 changelog.d/7230.feature
 delete mode 100644 changelog.d/7233.misc
 delete mode 100644 changelog.d/7234.doc
 delete mode 100644 changelog.d/7235.feature
 delete mode 100644 changelog.d/7236.misc
 delete mode 100644 changelog.d/7237.misc
 delete mode 100644 changelog.d/7238.doc
 delete mode 100644 changelog.d/7239.misc
 delete mode 100644 changelog.d/7240.bugfix
 delete mode 100644 changelog.d/7241.misc
 delete mode 100644 changelog.d/7243.misc
 delete mode 100644 changelog.d/7248.doc
 delete mode 100644 changelog.d/7249.bugfix
 delete mode 100644 changelog.d/7251.doc
 delete mode 100644 changelog.d/7259.bugfix
 delete mode 100644 changelog.d/7260.bugfix
 delete mode 100644 changelog.d/7261.misc
 delete mode 100644 changelog.d/7265.feature
 delete mode 100644 changelog.d/7268.bugfix
 delete mode 100644 changelog.d/7272.doc
 delete mode 100644 changelog.d/7274.bugfix
 delete mode 100644 changelog.d/7278.misc
 delete mode 100644 changelog.d/7279.feature
 delete mode 100644 changelog.d/7286.misc
 delete mode 100644 changelog.d/7290.misc
 delete mode 100644 changelog.d/7291.misc
 delete mode 100644 changelog.d/7295.misc
 delete mode 100644 changelog.d/7300.misc
 delete mode 100644 changelog.d/7302.bugfix
 delete mode 100644 changelog.d/7303.misc
 delete mode 100644 changelog.d/7315.feature
 delete mode 100644 changelog.d/7316.bugfix
 delete mode 100644 changelog.d/7318.misc
 delete mode 100644 changelog.d/7319.misc
 delete mode 100644 changelog.d/7321.misc
 delete mode 100644 changelog.d/7325.feature
 delete mode 100644 changelog.d/7326.misc
 delete mode 100644 changelog.d/7337.bugfix
 delete mode 100644 changelog.d/7338.misc
 delete mode 100644 changelog.d/7341.bugfix
 delete mode 100644 changelog.d/7343.feature
 delete mode 100644 changelog.d/7344.bugfix
 delete mode 100644 changelog.d/7352.feature
 delete mode 100644 changelog.d/7357.doc
 delete mode 100644 changelog.d/7358.bugfix
 delete mode 100644 changelog.d/7359.misc
 delete mode 100644 changelog.d/7361.doc
 delete mode 100644 changelog.d/7363.misc
 delete mode 100644 changelog.d/7364.misc
 delete mode 100644 changelog.d/7367.bugfix
 delete mode 100644 changelog.d/7368.bugfix
 delete mode 100644 changelog.d/7369.misc
 delete mode 100644 changelog.d/7378.misc
 delete mode 100644 changelog.d/7387.bugfix
 delete mode 100644 changelog.d/7393.bugfix
 delete mode 100644 changelog.d/7394.misc
 delete mode 100644 changelog.d/7395.misc
 delete mode 100644 changelog.d/7401.feature
 delete mode 100644 changelog.d/7404.misc
 delete mode 100644 changelog.d/7408.misc
 delete mode 100644 changelog.d/7420.misc
 delete mode 100644 changelog.d/7421.misc
 delete mode 100644 changelog.d/7422.feature
 delete mode 100644 changelog.d/7423.misc
 delete mode 100644 changelog.d/7426.misc
 delete mode 100644 changelog.d/7427.feature
 delete mode 100644 changelog.d/7439.feature
 delete mode 100644 changelog.d/7442.misc
 delete mode 100644 changelog.d/7446.feature
 delete mode 100644 changelog.d/7450.feature
 delete mode 100644 changelog.d/7454.feature
 delete mode 100644 changelog.d/7455.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index adb2b3e16..0b49e032d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,141 @@
+Synapse 1.13.0rc1 (2020-05-11)
+==============================
+
+Features
+--------
+
+- Extend the `web_client_location` option to accept an absolute URL to use as a redirect. Adds a warning when running the web client on the same hostname as homeserver. Contributed by Martin Milata. ([\#7006](https://github.com/matrix-org/synapse/issues/7006))
+- Set `Referrer-Policy` header to `no-referrer` on media downloads. ([\#7009](https://github.com/matrix-org/synapse/issues/7009))
+- Add support for running replication over Redis when using workers. ([\#7040](https://github.com/matrix-org/synapse/issues/7040), [\#7325](https://github.com/matrix-org/synapse/issues/7325), [\#7352](https://github.com/matrix-org/synapse/issues/7352), [\#7401](https://github.com/matrix-org/synapse/issues/7401), [\#7427](https://github.com/matrix-org/synapse/issues/7427), [\#7439](https://github.com/matrix-org/synapse/issues/7439), [\#7446](https://github.com/matrix-org/synapse/issues/7446), [\#7450](https://github.com/matrix-org/synapse/issues/7450), [\#7454](https://github.com/matrix-org/synapse/issues/7454))
+- Admin API `POST /_synapse/admin/v1/join/<roomIdOrAlias>` to join users to a room like `auto_join_rooms` for creation of users. ([\#7051](https://github.com/matrix-org/synapse/issues/7051))
+- Add options to prevent users from changing their profile or associated 3PIDs. ([\#7096](https://github.com/matrix-org/synapse/issues/7096))
+- Support SSO in the user interactive authentication workflow. ([\#7102](https://github.com/matrix-org/synapse/issues/7102), [\#7186](https://github.com/matrix-org/synapse/issues/7186), [\#7279](https://github.com/matrix-org/synapse/issues/7279), [\#7343](https://github.com/matrix-org/synapse/issues/7343))
+- Allow server admins to define and enforce a password policy (MSC2000). ([\#7118](https://github.com/matrix-org/synapse/issues/7118))
+- Improve the support for SSO authentication on the login fallback page. ([\#7152](https://github.com/matrix-org/synapse/issues/7152), [\#7235](https://github.com/matrix-org/synapse/issues/7235))
+- Always whitelist the login fallback in the SSO configuration if `public_baseurl` is set. ([\#7153](https://github.com/matrix-org/synapse/issues/7153))
+- Admin users are no longer required to be in a room to create an alias for it. ([\#7191](https://github.com/matrix-org/synapse/issues/7191))
+- Require admin privileges to enable room encryption by default. This does not affect existing rooms. ([\#7230](https://github.com/matrix-org/synapse/issues/7230))
+- Add a config option for specifying the value of the Accept-Language HTTP header when generating URL previews. ([\#7265](https://github.com/matrix-org/synapse/issues/7265))
+- Allow `/requestToken` endpoints to hide the existence (or lack thereof) of 3PID associations on the homeserver. ([\#7315](https://github.com/matrix-org/synapse/issues/7315))
+- Add a configuration setting to tweak the threshold for dummy events. ([\#7422](https://github.com/matrix-org/synapse/issues/7422))
+
+
+Bugfixes
+--------
+
+- Don't attempt to use an invalid sqlite config if no database configuration is provided. Contributed by @nekatak. ([\#6573](https://github.com/matrix-org/synapse/issues/6573))
+- Fix single-sign on with CAS systems: pass the same service URL when requesting the CAS ticket and when calling the `proxyValidate` URL. Contributed by @Naugrimm. ([\#6634](https://github.com/matrix-org/synapse/issues/6634))
+- Fix missing field `default` when fetching user-defined push rules. ([\#6639](https://github.com/matrix-org/synapse/issues/6639))
+- Improve error responses when accessing remote public room lists. ([\#6899](https://github.com/matrix-org/synapse/issues/6899), [\#7368](https://github.com/matrix-org/synapse/issues/7368))
+- Transfer alias mappings on room upgrade. ([\#6946](https://github.com/matrix-org/synapse/issues/6946))
+- Ensure that a user inteactive authentication session is tied to a single request. ([\#7068](https://github.com/matrix-org/synapse/issues/7068), [\#7455](https://github.com/matrix-org/synapse/issues/7455))
+- Fix a bug in the federation API which could cause occasional "Failed to get PDU" errors. ([\#7089](https://github.com/matrix-org/synapse/issues/7089))
+- Return the proper error (M_BAD_ALIAS) when a non-existant canonical alias is provided. ([\#7109](https://github.com/matrix-org/synapse/issues/7109))
+- Fix a bug which meant that groups updates were not correctly replicated between workers. ([\#7117](https://github.com/matrix-org/synapse/issues/7117))
+- Fix starting workers when federation sending not split out. ([\#7133](https://github.com/matrix-org/synapse/issues/7133))
+- Ensure `is_verified` is a boolean in responses to `GET /_matrix/client/r0/room_keys/keys`. Also warn the user if they forgot the `version` query param. ([\#7150](https://github.com/matrix-org/synapse/issues/7150))
+- Fix error page being shown when a custom SAML handler attempted to redirect when processing an auth response. ([\#7151](https://github.com/matrix-org/synapse/issues/7151))
+- Avoid importing `sqlite3` when using the postgres backend. Contributed by David Vo. ([\#7155](https://github.com/matrix-org/synapse/issues/7155))
+- Fix excessive CPU usage by `prune_old_outbound_device_pokes` job. ([\#7159](https://github.com/matrix-org/synapse/issues/7159))
+- Fix a bug which could cause outbound federation traffic to stop working if a client uploaded an incorrect e2e device signature. ([\#7177](https://github.com/matrix-org/synapse/issues/7177))
+- Fix a bug which could cause incorrect 'cyclic dependency' error. ([\#7178](https://github.com/matrix-org/synapse/issues/7178))
+- Fix a bug that could cause a user to be invited to a server notices (aka System Alerts) room without any notice being sent. ([\#7199](https://github.com/matrix-org/synapse/issues/7199))
+- Fix some worker-mode replication handling not being correctly recorded in CPU usage stats. ([\#7203](https://github.com/matrix-org/synapse/issues/7203))
+- Do not allow a deactivated user to login via SSO. ([\#7240](https://github.com/matrix-org/synapse/issues/7240), [\#7259](https://github.com/matrix-org/synapse/issues/7259))
+- Fix --help command-line argument. ([\#7249](https://github.com/matrix-org/synapse/issues/7249))
+- Fix room publish permissions not being checked on room creation. ([\#7260](https://github.com/matrix-org/synapse/issues/7260))
+- Reject unknown session IDs during user interactive authentication instead of silently creating a new session. ([\#7268](https://github.com/matrix-org/synapse/issues/7268))
+- Fix a sql query introduced in Synapse 1.12.0 which could cause large amounts of logging to the postgres slow-query log. ([\#7274](https://github.com/matrix-org/synapse/issues/7274))
+- Persist user interactive authentication sessions across workers and Synapse restarts. ([\#7302](https://github.com/matrix-org/synapse/issues/7302))
+- Fixed backwards compatibility logic of the first value of `trusted_third_party_id_servers` being used for `account_threepid_delegates.email`, which occurs when the former, deprecated option is set and the latter is not. ([\#7316](https://github.com/matrix-org/synapse/issues/7316))
+- Fix a bug where event updates might not be sent over replication to worker processes after the stream falls behind. ([\#7337](https://github.com/matrix-org/synapse/issues/7337), [\#7358](https://github.com/matrix-org/synapse/issues/7358))
+- Fix bad error handling that would cause Synapse to crash if it's provided with a YAML configuration file that's either empty or doesn't parse into a key-value map. ([\#7341](https://github.com/matrix-org/synapse/issues/7341))
+- Fix incorrect metrics reporting for `renew_attestations` background task. ([\#7344](https://github.com/matrix-org/synapse/issues/7344))
+- Prevent non-federating rooms from appearing in responses to federated `POST /publicRoom` requests when a filter was included. ([\#7367](https://github.com/matrix-org/synapse/issues/7367))
+- Fix a bug which would cause the room durectory to be incorrectly populated if Synapse was upgraded directly from v1.2.1 or earlier to v1.4.0 or later. Note that this fix does not apply retrospectively; see the [upgrade notes](UPGRADE.rst#upgrading-to-v1130) for more information. ([\#7387](https://github.com/matrix-org/synapse/issues/7387))
+- Fix bug in `EventContext.deserialize`. ([\#7393](https://github.com/matrix-org/synapse/issues/7393))
+
+
+Improved Documentation
+----------------------
+
+- Update Debian installation instructions to recommend installing the `virtualenv` package instead of `python3-virtualenv`. ([\#6892](https://github.com/matrix-org/synapse/issues/6892))
+- Improve the documentation for database configuration. ([\#6988](https://github.com/matrix-org/synapse/issues/6988))
+- Improve the documentation of application service configuration files. ([\#7091](https://github.com/matrix-org/synapse/issues/7091))
+- Update pre-built package name for FreeBSD. ([\#7107](https://github.com/matrix-org/synapse/issues/7107))
+- Update postgres docs with login troubleshooting information. ([\#7119](https://github.com/matrix-org/synapse/issues/7119))
+- Clean up INSTALL.md a bit. ([\#7141](https://github.com/matrix-org/synapse/issues/7141))
+- Add documentation for running a local CAS server for testing. ([\#7147](https://github.com/matrix-org/synapse/issues/7147))
+- Improve README.md by being explicit about public IP recommendation for TURN relaying. ([\#7167](https://github.com/matrix-org/synapse/issues/7167))
+- Fix a small typo in the `metrics_flags` config option. ([\#7171](https://github.com/matrix-org/synapse/issues/7171))
+- Update the contributed documentation on managing synapse workers with systemd, and bring it into the core distribution. ([\#7234](https://github.com/matrix-org/synapse/issues/7234))
+- Add documentation to the `password_providers` config option. Add known password provider implementations to docs. ([\#7238](https://github.com/matrix-org/synapse/issues/7238), [\#7248](https://github.com/matrix-org/synapse/issues/7248))
+- Modify suggested nginx reverse proxy configuration to match Synapse's default file upload size. Contributed by @ProCycleDev. ([\#7251](https://github.com/matrix-org/synapse/issues/7251))
+- Documentation of media_storage_providers options updated to avoid misunderstandings. Contributed by Tristan Lins. ([\#7272](https://github.com/matrix-org/synapse/issues/7272))
+- Add documentation on monitoring workers with Prometheus. ([\#7357](https://github.com/matrix-org/synapse/issues/7357))
+- Clarify endpoint usage in the users admin api documentation. ([\#7361](https://github.com/matrix-org/synapse/issues/7361))
+
+
+Deprecations and Removals
+-------------------------
+
+- Remove nonfunctional `captcha_bypass_secret` option from `homeserver.yaml`. ([\#7137](https://github.com/matrix-org/synapse/issues/7137))
+
+
+Internal Changes
+----------------
+
+- Add benchmarks for LruCache. ([\#6446](https://github.com/matrix-org/synapse/issues/6446))
+- Return total number of users and profile attributes in admin users endpoint. Contributed by Awesome Technologies Innovationslabor GmbH. ([\#6881](https://github.com/matrix-org/synapse/issues/6881))
+- Change device list streams to have one row per ID. ([\#7010](https://github.com/matrix-org/synapse/issues/7010))
+- Remove concept of a non-limited stream. ([\#7011](https://github.com/matrix-org/synapse/issues/7011))
+- Move catchup of replication streams logic to worker. ([\#7024](https://github.com/matrix-org/synapse/issues/7024), [\#7195](https://github.com/matrix-org/synapse/issues/7195), [\#7226](https://github.com/matrix-org/synapse/issues/7226), [\#7239](https://github.com/matrix-org/synapse/issues/7239), [\#7286](https://github.com/matrix-org/synapse/issues/7286), [\#7290](https://github.com/matrix-org/synapse/issues/7290), [\#7318](https://github.com/matrix-org/synapse/issues/7318), [\#7326](https://github.com/matrix-org/synapse/issues/7326), [\#7378](https://github.com/matrix-org/synapse/issues/7378), [\#7421](https://github.com/matrix-org/synapse/issues/7421))
+- Convert some of synapse.rest.media to async/await. ([\#7110](https://github.com/matrix-org/synapse/issues/7110), [\#7184](https://github.com/matrix-org/synapse/issues/7184), [\#7241](https://github.com/matrix-org/synapse/issues/7241))
+- De-duplicate / remove unused REST code for login and auth. ([\#7115](https://github.com/matrix-org/synapse/issues/7115))
+- Convert `*StreamRow` classes to inner classes. ([\#7116](https://github.com/matrix-org/synapse/issues/7116))
+- Clean up some LoggingContext code. ([\#7120](https://github.com/matrix-org/synapse/issues/7120), [\#7181](https://github.com/matrix-org/synapse/issues/7181), [\#7183](https://github.com/matrix-org/synapse/issues/7183), [\#7408](https://github.com/matrix-org/synapse/issues/7408), [\#7426](https://github.com/matrix-org/synapse/issues/7426))
+- Add explicit `instance_id` for USER_SYNC commands and remove implicit `conn_id` usage. ([\#7128](https://github.com/matrix-org/synapse/issues/7128))
+- Refactored the CAS authentication logic to a separate class. ([\#7136](https://github.com/matrix-org/synapse/issues/7136))
+- Run replication streamers on workers. ([\#7146](https://github.com/matrix-org/synapse/issues/7146))
+- Add tests for outbound device pokes. ([\#7157](https://github.com/matrix-org/synapse/issues/7157))
+- Fix device list update stream ids going backward. ([\#7158](https://github.com/matrix-org/synapse/issues/7158))
+- Use `stream.current_token()` and remove `stream_positions()`. ([\#7172](https://github.com/matrix-org/synapse/issues/7172))
+- Move client command handling out of TCP protocol. ([\#7185](https://github.com/matrix-org/synapse/issues/7185))
+- Move server command handling out of TCP protocol. ([\#7187](https://github.com/matrix-org/synapse/issues/7187))
+- Fix consistency of HTTP status codes reported in log lines. ([\#7188](https://github.com/matrix-org/synapse/issues/7188))
+- Only run one background database update at a time. ([\#7190](https://github.com/matrix-org/synapse/issues/7190))
+- Remove sent outbound device list pokes from the database. ([\#7192](https://github.com/matrix-org/synapse/issues/7192))
+- Add a background database update job to clear out duplicate `device_lists_outbound_pokes`. ([\#7193](https://github.com/matrix-org/synapse/issues/7193))
+- Remove some extraneous debugging log lines. ([\#7207](https://github.com/matrix-org/synapse/issues/7207))
+- Add explicit Python build tooling as dependencies for the snapcraft build. ([\#7213](https://github.com/matrix-org/synapse/issues/7213))
+- Add typing information to federation server code. ([\#7219](https://github.com/matrix-org/synapse/issues/7219))
+- Extend room admin api (`GET /_synapse/admin/v1/rooms`) with additional attributes. ([\#7225](https://github.com/matrix-org/synapse/issues/7225))
+- Unblacklist '/upgrade creates a new room' sytest for workers. ([\#7228](https://github.com/matrix-org/synapse/issues/7228))
+- Remove redundant checks on `daemonize` from synctl. ([\#7233](https://github.com/matrix-org/synapse/issues/7233))
+- Upgrade jQuery to v3.4.1 on fallback login/registration pages. ([\#7236](https://github.com/matrix-org/synapse/issues/7236))
+- Change log line that told user to implement onLogin/onRegister fallback js functions to a warning, instead of an info, so it's more visible. ([\#7237](https://github.com/matrix-org/synapse/issues/7237))
+- Correct the parameters of a test fixture. Contributed by Isaiah Singletary. ([\#7243](https://github.com/matrix-org/synapse/issues/7243))
+- Convert auth handler to async/await. ([\#7261](https://github.com/matrix-org/synapse/issues/7261))
+- Add some unit tests for replication. ([\#7278](https://github.com/matrix-org/synapse/issues/7278))
+- Improve typing annotations in `synapse.replication.tcp.streams.Stream`. ([\#7291](https://github.com/matrix-org/synapse/issues/7291))
+- Reduce log verbosity of url cache cleanup tasks. ([\#7295](https://github.com/matrix-org/synapse/issues/7295))
+- Fix sample SAML Service Provider configuration. Contributed by @frcl. ([\#7300](https://github.com/matrix-org/synapse/issues/7300))
+- Fix StreamChangeCache to work with multiple entities changing on the same stream id. ([\#7303](https://github.com/matrix-org/synapse/issues/7303))
+- Fix an incorrect import in IdentityHandler. ([\#7319](https://github.com/matrix-org/synapse/issues/7319))
+- Reduce logging verbosity for successful federation requests. ([\#7321](https://github.com/matrix-org/synapse/issues/7321))
+- Convert some federation handler code to async/await. ([\#7338](https://github.com/matrix-org/synapse/issues/7338))
+- Fix collation for postgres for unit tests. ([\#7359](https://github.com/matrix-org/synapse/issues/7359))
+- Convert RegistrationWorkerStore.is_server_admin and dependent code to async/await. ([\#7363](https://github.com/matrix-org/synapse/issues/7363))
+- Add an `instance_name` to `RDATA` and `POSITION` replication commands. ([\#7364](https://github.com/matrix-org/synapse/issues/7364))
+- Thread through instance name to replication client. ([\#7369](https://github.com/matrix-org/synapse/issues/7369))
+- Convert synapse.server_notices to async/await. ([\#7394](https://github.com/matrix-org/synapse/issues/7394))
+- Convert synapse.notifier to async/await. ([\#7395](https://github.com/matrix-org/synapse/issues/7395))
+- Fix issues with the Python package manifest. ([\#7404](https://github.com/matrix-org/synapse/issues/7404))
+- Prevent methods in `synapse.handlers.auth` from polling the homeserver config every request. ([\#7420](https://github.com/matrix-org/synapse/issues/7420))
+- Speed up fetching device lists changes when handling `/sync` requests. ([\#7423](https://github.com/matrix-org/synapse/issues/7423))
+- Run group attestation renewal in series rather than parallel for performance. ([\#7442](https://github.com/matrix-org/synapse/issues/7442))
+
+
 Next version
 ============
 
diff --git a/changelog.d/6446.misc b/changelog.d/6446.misc
deleted file mode 100644
index c42df16f1..000000000
--- a/changelog.d/6446.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add benchmarks for LruCache.
diff --git a/changelog.d/6573.bugfix b/changelog.d/6573.bugfix
deleted file mode 100644
index 1bb8014db..000000000
--- a/changelog.d/6573.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Don't attempt to use an invalid sqlite config if no database configuration is provided. Contributed by @nekatak.
diff --git a/changelog.d/6634.bugfix b/changelog.d/6634.bugfix
deleted file mode 100644
index ec48fdc0a..000000000
--- a/changelog.d/6634.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix single-sign on with CAS systems: pass the same service URL when requesting the CAS ticket and when calling the `proxyValidate` URL. Contributed by @Naugrimm.
diff --git a/changelog.d/6639.bugfix b/changelog.d/6639.bugfix
deleted file mode 100644
index c7593a6e8..000000000
--- a/changelog.d/6639.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix missing field `default` when fetching user-defined push rules.
diff --git a/changelog.d/6881.misc b/changelog.d/6881.misc
deleted file mode 100644
index 03b89ccd3..000000000
--- a/changelog.d/6881.misc
+++ /dev/null
@@ -1 +0,0 @@
-Return total number of users and profile attributes in admin users endpoint. Contributed by Awesome Technologies Innovationslabor GmbH.
diff --git a/changelog.d/6892.doc b/changelog.d/6892.doc
deleted file mode 100644
index 0d04cf0bd..000000000
--- a/changelog.d/6892.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update Debian installation instructions to recommend installing the `virtualenv` package instead of `python3-virtualenv`.
\ No newline at end of file
diff --git a/changelog.d/6899.bugfix b/changelog.d/6899.bugfix
deleted file mode 100644
index efa8a40b1..000000000
--- a/changelog.d/6899.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Improve error responses when accessing remote public room lists.
\ No newline at end of file
diff --git a/changelog.d/6946.bugfix b/changelog.d/6946.bugfix
deleted file mode 100644
index a238c83a1..000000000
--- a/changelog.d/6946.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Transfer alias mappings on room upgrade.
\ No newline at end of file
diff --git a/changelog.d/6988.doc b/changelog.d/6988.doc
deleted file mode 100644
index b6f71bb96..000000000
--- a/changelog.d/6988.doc
+++ /dev/null
@@ -1 +0,0 @@
-Improve the documentation for database configuration.
diff --git a/changelog.d/7006.feature b/changelog.d/7006.feature
deleted file mode 100644
index d2ce9dbac..000000000
--- a/changelog.d/7006.feature
+++ /dev/null
@@ -1 +0,0 @@
-Extend the `web_client_location` option to accept an absolute URL to use as a redirect. Adds a warning when running the web client on the same hostname as homeserver. Contributed by Martin Milata.
diff --git a/changelog.d/7009.feature b/changelog.d/7009.feature
deleted file mode 100644
index cd2705d5b..000000000
--- a/changelog.d/7009.feature
+++ /dev/null
@@ -1 +0,0 @@
-Set `Referrer-Policy` header to `no-referrer` on media downloads.
diff --git a/changelog.d/7010.misc b/changelog.d/7010.misc
deleted file mode 100644
index 4ba1f6cdf..000000000
--- a/changelog.d/7010.misc
+++ /dev/null
@@ -1 +0,0 @@
-Change device list streams to have one row per ID.
diff --git a/changelog.d/7011.misc b/changelog.d/7011.misc
deleted file mode 100644
index 41c3b3757..000000000
--- a/changelog.d/7011.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove concept of a non-limited stream.
diff --git a/changelog.d/7024.misc b/changelog.d/7024.misc
deleted file mode 100644
index 676f28537..000000000
--- a/changelog.d/7024.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move catchup of replication streams logic to worker.
diff --git a/changelog.d/7040.feature b/changelog.d/7040.feature
deleted file mode 100644
index ce6140fdd..000000000
--- a/changelog.d/7040.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for running replication over Redis when using workers.
diff --git a/changelog.d/7051.feature b/changelog.d/7051.feature
deleted file mode 100644
index 3e36a3f65..000000000
--- a/changelog.d/7051.feature
+++ /dev/null
@@ -1 +0,0 @@
-Admin API `POST /_synapse/admin/v1/join/<roomIdOrAlias>` to join users to a room like `auto_join_rooms` for creation of users.
\ No newline at end of file
diff --git a/changelog.d/7068.bugfix b/changelog.d/7068.bugfix
deleted file mode 100644
index d1693a7f2..000000000
--- a/changelog.d/7068.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ensure that a user inteactive authentication session is tied to a single request.
diff --git a/changelog.d/7089.bugfix b/changelog.d/7089.bugfix
deleted file mode 100644
index f1f440f23..000000000
--- a/changelog.d/7089.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug in the federation API which could cause occasional "Failed to get PDU" errors.
diff --git a/changelog.d/7091.doc b/changelog.d/7091.doc
deleted file mode 100644
index 463536c81..000000000
--- a/changelog.d/7091.doc
+++ /dev/null
@@ -1 +0,0 @@
-Improve the documentation of application service configuration files.
diff --git a/changelog.d/7096.feature b/changelog.d/7096.feature
deleted file mode 100644
index 00f47b2a1..000000000
--- a/changelog.d/7096.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add options to prevent users from changing their profile or associated 3PIDs.
\ No newline at end of file
diff --git a/changelog.d/7102.feature b/changelog.d/7102.feature
deleted file mode 100644
index 01057aa39..000000000
--- a/changelog.d/7102.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support SSO in the user interactive authentication workflow.
diff --git a/changelog.d/7107.doc b/changelog.d/7107.doc
deleted file mode 100644
index f6da32d40..000000000
--- a/changelog.d/7107.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update pre-built package name for FreeBSD.
diff --git a/changelog.d/7109.bugfix b/changelog.d/7109.bugfix
deleted file mode 100644
index 268de9978..000000000
--- a/changelog.d/7109.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Return the proper error (M_BAD_ALIAS) when a non-existant canonical alias is provided.
diff --git a/changelog.d/7110.misc b/changelog.d/7110.misc
deleted file mode 100644
index fac5bc040..000000000
--- a/changelog.d/7110.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert some of synapse.rest.media to async/await.
diff --git a/changelog.d/7115.misc b/changelog.d/7115.misc
deleted file mode 100644
index 7d4a011e3..000000000
--- a/changelog.d/7115.misc
+++ /dev/null
@@ -1 +0,0 @@
-De-duplicate / remove unused REST code for login and auth.
diff --git a/changelog.d/7116.misc b/changelog.d/7116.misc
deleted file mode 100644
index 89d90bd49..000000000
--- a/changelog.d/7116.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert `*StreamRow` classes to inner classes.
diff --git a/changelog.d/7117.bugfix b/changelog.d/7117.bugfix
deleted file mode 100644
index 1896d7ad4..000000000
--- a/changelog.d/7117.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug which meant that groups updates were not correctly replicated between workers.
diff --git a/changelog.d/7118.feature b/changelog.d/7118.feature
deleted file mode 100644
index 5cbfd9816..000000000
--- a/changelog.d/7118.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow server admins to define and enforce a password policy (MSC2000).
\ No newline at end of file
diff --git a/changelog.d/7119.doc b/changelog.d/7119.doc
deleted file mode 100644
index 05192966c..000000000
--- a/changelog.d/7119.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update postgres docs with login troubleshooting information.
\ No newline at end of file
diff --git a/changelog.d/7120.misc b/changelog.d/7120.misc
deleted file mode 100644
index 731f4dcb5..000000000
--- a/changelog.d/7120.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up some LoggingContext code.
diff --git a/changelog.d/7128.misc b/changelog.d/7128.misc
deleted file mode 100644
index 5703f6d2e..000000000
--- a/changelog.d/7128.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add explicit `instance_id` for USER_SYNC commands and remove implicit `conn_id` usage.
diff --git a/changelog.d/7133.bugfix b/changelog.d/7133.bugfix
deleted file mode 100644
index 61a86fd34..000000000
--- a/changelog.d/7133.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix starting workers when federation sending not split out.
diff --git a/changelog.d/7136.misc b/changelog.d/7136.misc
deleted file mode 100644
index 3f666d25f..000000000
--- a/changelog.d/7136.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactored the CAS authentication logic to a separate class.
diff --git a/changelog.d/7137.removal b/changelog.d/7137.removal
deleted file mode 100644
index 75266a06b..000000000
--- a/changelog.d/7137.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove nonfunctional `captcha_bypass_secret` option from `homeserver.yaml`.
\ No newline at end of file
diff --git a/changelog.d/7141.doc b/changelog.d/7141.doc
deleted file mode 100644
index 2fcbd666c..000000000
--- a/changelog.d/7141.doc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up INSTALL.md a bit.
\ No newline at end of file
diff --git a/changelog.d/7146.misc b/changelog.d/7146.misc
deleted file mode 100644
index facde0695..000000000
--- a/changelog.d/7146.misc
+++ /dev/null
@@ -1 +0,0 @@
-Run replication streamers on workers.
diff --git a/changelog.d/7147.doc b/changelog.d/7147.doc
deleted file mode 100644
index 2c855ff5f..000000000
--- a/changelog.d/7147.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add documentation for running a local CAS server for testing.
diff --git a/changelog.d/7150.bugfix b/changelog.d/7150.bugfix
deleted file mode 100644
index 1feb29479..000000000
--- a/changelog.d/7150.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ensure `is_verified` is a boolean in responses to `GET /_matrix/client/r0/room_keys/keys`. Also warn the user if they forgot the `version` query param.
\ No newline at end of file
diff --git a/changelog.d/7151.bugfix b/changelog.d/7151.bugfix
deleted file mode 100644
index 8aaa2dc65..000000000
--- a/changelog.d/7151.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix error page being shown when a custom SAML handler attempted to redirect when processing an auth response.
diff --git a/changelog.d/7152.feature b/changelog.d/7152.feature
deleted file mode 100644
index fafa79c7e..000000000
--- a/changelog.d/7152.feature
+++ /dev/null
@@ -1 +0,0 @@
-Improve the support for SSO authentication on the login fallback page.
diff --git a/changelog.d/7153.feature b/changelog.d/7153.feature
deleted file mode 100644
index 414ebe1f6..000000000
--- a/changelog.d/7153.feature
+++ /dev/null
@@ -1 +0,0 @@
-Always whitelist the login fallback in the SSO configuration if `public_baseurl` is set.
diff --git a/changelog.d/7155.bugfix b/changelog.d/7155.bugfix
deleted file mode 100644
index 0bf51e7ab..000000000
--- a/changelog.d/7155.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Avoid importing `sqlite3` when using the postgres backend. Contributed by David Vo.
diff --git a/changelog.d/7157.misc b/changelog.d/7157.misc
deleted file mode 100644
index 0eb1128c7..000000000
--- a/changelog.d/7157.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add tests for outbound device pokes.
diff --git a/changelog.d/7158.misc b/changelog.d/7158.misc
deleted file mode 100644
index 269b8daeb..000000000
--- a/changelog.d/7158.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix device list update stream ids going backward.
diff --git a/changelog.d/7159.bugfix b/changelog.d/7159.bugfix
deleted file mode 100644
index 1b341b127..000000000
--- a/changelog.d/7159.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix excessive CPU usage by `prune_old_outbound_device_pokes` job.
diff --git a/changelog.d/7167.doc b/changelog.d/7167.doc
deleted file mode 100644
index a7e7ba9b5..000000000
--- a/changelog.d/7167.doc
+++ /dev/null
@@ -1 +0,0 @@
-Improve README.md by being explicit about public IP recommendation for TURN relaying.
diff --git a/changelog.d/7171.doc b/changelog.d/7171.doc
deleted file mode 100644
index 25a3bd8ac..000000000
--- a/changelog.d/7171.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix a small typo in the `metrics_flags` config option.
\ No newline at end of file
diff --git a/changelog.d/7172.misc b/changelog.d/7172.misc
deleted file mode 100644
index ffecdf97f..000000000
--- a/changelog.d/7172.misc
+++ /dev/null
@@ -1 +0,0 @@
-Use `stream.current_token()` and remove `stream_positions()`.
diff --git a/changelog.d/7177.bugfix b/changelog.d/7177.bugfix
deleted file mode 100644
index 329a96cb0..000000000
--- a/changelog.d/7177.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug which could cause outbound federation traffic to stop working if a client uploaded an incorrect e2e device signature.
\ No newline at end of file
diff --git a/changelog.d/7178.bugfix b/changelog.d/7178.bugfix
deleted file mode 100644
index 35ea645d7..000000000
--- a/changelog.d/7178.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug which could cause incorrect 'cyclic dependency' error.
diff --git a/changelog.d/7181.misc b/changelog.d/7181.misc
deleted file mode 100644
index 731f4dcb5..000000000
--- a/changelog.d/7181.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up some LoggingContext code.
diff --git a/changelog.d/7183.misc b/changelog.d/7183.misc
deleted file mode 100644
index 731f4dcb5..000000000
--- a/changelog.d/7183.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up some LoggingContext code.
diff --git a/changelog.d/7184.misc b/changelog.d/7184.misc
deleted file mode 100644
index fac5bc040..000000000
--- a/changelog.d/7184.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert some of synapse.rest.media to async/await.
diff --git a/changelog.d/7185.misc b/changelog.d/7185.misc
deleted file mode 100644
index deb9ca702..000000000
--- a/changelog.d/7185.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move client command handling out of TCP protocol.
diff --git a/changelog.d/7186.feature b/changelog.d/7186.feature
deleted file mode 100644
index 01057aa39..000000000
--- a/changelog.d/7186.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support SSO in the user interactive authentication workflow.
diff --git a/changelog.d/7187.misc b/changelog.d/7187.misc
deleted file mode 100644
index 60d68ae87..000000000
--- a/changelog.d/7187.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move server command handling out of TCP protocol.
diff --git a/changelog.d/7188.misc b/changelog.d/7188.misc
deleted file mode 100644
index f72955b95..000000000
--- a/changelog.d/7188.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix consistency of HTTP status codes reported in log lines.
diff --git a/changelog.d/7190.misc b/changelog.d/7190.misc
deleted file mode 100644
index 34348873f..000000000
--- a/changelog.d/7190.misc
+++ /dev/null
@@ -1 +0,0 @@
-Only run one background database update at a time.
diff --git a/changelog.d/7191.feature b/changelog.d/7191.feature
deleted file mode 100644
index 83d5685bb..000000000
--- a/changelog.d/7191.feature
+++ /dev/null
@@ -1 +0,0 @@
-Admin users are no longer required to be in a room to create an alias for it.
diff --git a/changelog.d/7192.misc b/changelog.d/7192.misc
deleted file mode 100644
index e401e3639..000000000
--- a/changelog.d/7192.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove sent outbound device list pokes from the database.
diff --git a/changelog.d/7193.misc b/changelog.d/7193.misc
deleted file mode 100644
index 383a738e6..000000000
--- a/changelog.d/7193.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a background database update job to clear out duplicate `device_lists_outbound_pokes`.
diff --git a/changelog.d/7195.misc b/changelog.d/7195.misc
deleted file mode 100644
index 676f28537..000000000
--- a/changelog.d/7195.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move catchup of replication streams logic to worker.
diff --git a/changelog.d/7199.bugfix b/changelog.d/7199.bugfix
deleted file mode 100644
index b234163ea..000000000
--- a/changelog.d/7199.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug that could cause a user to be invited to a server notices (aka System Alerts) room without any notice being sent.
diff --git a/changelog.d/7203.bugfix b/changelog.d/7203.bugfix
deleted file mode 100644
index 8b383952e..000000000
--- a/changelog.d/7203.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix some worker-mode replication handling not being correctly recorded in CPU usage stats.
diff --git a/changelog.d/7207.misc b/changelog.d/7207.misc
deleted file mode 100644
index 4f9b6a108..000000000
--- a/changelog.d/7207.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove some extraneous debugging log lines.
\ No newline at end of file
diff --git a/changelog.d/7213.misc b/changelog.d/7213.misc
deleted file mode 100644
index 03cbfb5f6..000000000
--- a/changelog.d/7213.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add explicit Python build tooling as dependencies for the snapcraft build.
diff --git a/changelog.d/7219.misc b/changelog.d/7219.misc
deleted file mode 100644
index 4af5da864..000000000
--- a/changelog.d/7219.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add typing information to federation server code.
diff --git a/changelog.d/7225.misc b/changelog.d/7225.misc
deleted file mode 100644
index 375e2a475..000000000
--- a/changelog.d/7225.misc
+++ /dev/null
@@ -1 +0,0 @@
-Extend room admin api (`GET /_synapse/admin/v1/rooms`) with additional attributes.
\ No newline at end of file
diff --git a/changelog.d/7226.misc b/changelog.d/7226.misc
deleted file mode 100644
index 676f28537..000000000
--- a/changelog.d/7226.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move catchup of replication streams logic to worker.
diff --git a/changelog.d/7228.misc b/changelog.d/7228.misc
deleted file mode 100644
index 50e206377..000000000
--- a/changelog.d/7228.misc
+++ /dev/null
@@ -1 +0,0 @@
-Unblacklist '/upgrade creates a new room' sytest for workers.
\ No newline at end of file
diff --git a/changelog.d/7230.feature b/changelog.d/7230.feature
deleted file mode 100644
index aab777648..000000000
--- a/changelog.d/7230.feature
+++ /dev/null
@@ -1 +0,0 @@
-Require admin privileges to enable room encryption by default. This does not affect existing rooms.
diff --git a/changelog.d/7233.misc b/changelog.d/7233.misc
deleted file mode 100644
index d9ad58272..000000000
--- a/changelog.d/7233.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove redundant checks on `daemonize` from synctl.
diff --git a/changelog.d/7234.doc b/changelog.d/7234.doc
deleted file mode 100644
index d284f1422..000000000
--- a/changelog.d/7234.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update the contributed documentation on managing synapse workers with systemd, and bring it into the core distribution.
diff --git a/changelog.d/7235.feature b/changelog.d/7235.feature
deleted file mode 100644
index fafa79c7e..000000000
--- a/changelog.d/7235.feature
+++ /dev/null
@@ -1 +0,0 @@
-Improve the support for SSO authentication on the login fallback page.
diff --git a/changelog.d/7236.misc b/changelog.d/7236.misc
deleted file mode 100644
index e4a2702b5..000000000
--- a/changelog.d/7236.misc
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade jQuery to v3.4.1 on fallback login/registration pages.
\ No newline at end of file
diff --git a/changelog.d/7237.misc b/changelog.d/7237.misc
deleted file mode 100644
index 92e67ea31..000000000
--- a/changelog.d/7237.misc
+++ /dev/null
@@ -1 +0,0 @@
-Change log line that told user to implement onLogin/onRegister fallback js functions to a warning, instead of an info, so it's more visible.
\ No newline at end of file
diff --git a/changelog.d/7238.doc b/changelog.d/7238.doc
deleted file mode 100644
index 0e3b4be42..000000000
--- a/changelog.d/7238.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add documentation to the `password_providers` config option. Add known password provider implementations to docs.
\ No newline at end of file
diff --git a/changelog.d/7239.misc b/changelog.d/7239.misc
deleted file mode 100644
index 676f28537..000000000
--- a/changelog.d/7239.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move catchup of replication streams logic to worker.
diff --git a/changelog.d/7240.bugfix b/changelog.d/7240.bugfix
deleted file mode 100644
index 83b18d3e1..000000000
--- a/changelog.d/7240.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Do not allow a deactivated user to login via SSO.
diff --git a/changelog.d/7241.misc b/changelog.d/7241.misc
deleted file mode 100644
index fac5bc040..000000000
--- a/changelog.d/7241.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert some of synapse.rest.media to async/await.
diff --git a/changelog.d/7243.misc b/changelog.d/7243.misc
deleted file mode 100644
index a39c257a5..000000000
--- a/changelog.d/7243.misc
+++ /dev/null
@@ -1 +0,0 @@
-Correct the parameters of a test fixture. Contributed by Isaiah Singletary.
diff --git a/changelog.d/7248.doc b/changelog.d/7248.doc
deleted file mode 100644
index 0e3b4be42..000000000
--- a/changelog.d/7248.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add documentation to the `password_providers` config option. Add known password provider implementations to docs.
\ No newline at end of file
diff --git a/changelog.d/7249.bugfix b/changelog.d/7249.bugfix
deleted file mode 100644
index 6ae700d36..000000000
--- a/changelog.d/7249.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix --help command-line argument.
diff --git a/changelog.d/7251.doc b/changelog.d/7251.doc
deleted file mode 100644
index 596a28e65..000000000
--- a/changelog.d/7251.doc
+++ /dev/null
@@ -1 +0,0 @@
-Modify suggested nginx reverse proxy configuration to match Synapse's default file upload size. Contributed by @ProCycleDev.
diff --git a/changelog.d/7259.bugfix b/changelog.d/7259.bugfix
deleted file mode 100644
index 55bb06be8..000000000
--- a/changelog.d/7259.bugfix
+++ /dev/null
@@ -1 +0,0 @@
- Do not allow a deactivated user to login via SSO.
diff --git a/changelog.d/7260.bugfix b/changelog.d/7260.bugfix
deleted file mode 100644
index 9e50b56f2..000000000
--- a/changelog.d/7260.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix room publish permissions not being checked on room creation.
diff --git a/changelog.d/7261.misc b/changelog.d/7261.misc
deleted file mode 100644
index 88165f010..000000000
--- a/changelog.d/7261.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert auth handler to async/await.
diff --git a/changelog.d/7265.feature b/changelog.d/7265.feature
deleted file mode 100644
index 345b63e0b..000000000
--- a/changelog.d/7265.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a config option for specifying the value of the Accept-Language HTTP header when generating URL previews.
\ No newline at end of file
diff --git a/changelog.d/7268.bugfix b/changelog.d/7268.bugfix
deleted file mode 100644
index ab280da18..000000000
--- a/changelog.d/7268.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Reject unknown session IDs during user interactive authentication instead of silently creating a new session.
diff --git a/changelog.d/7272.doc b/changelog.d/7272.doc
deleted file mode 100644
index 13a1ee340..000000000
--- a/changelog.d/7272.doc
+++ /dev/null
@@ -1 +0,0 @@
-Documentation of media_storage_providers options updated to avoid misunderstandings. Contributed by Tristan Lins.
\ No newline at end of file
diff --git a/changelog.d/7274.bugfix b/changelog.d/7274.bugfix
deleted file mode 100644
index 211a38bef..000000000
--- a/changelog.d/7274.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a sql query introduced in Synapse 1.12.0 which could cause large amounts of logging to the postgres slow-query log.
diff --git a/changelog.d/7278.misc b/changelog.d/7278.misc
deleted file mode 100644
index 8a4c4328f..000000000
--- a/changelog.d/7278.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add some unit tests for replication.
diff --git a/changelog.d/7279.feature b/changelog.d/7279.feature
deleted file mode 100644
index 9aed07547..000000000
--- a/changelog.d/7279.feature
+++ /dev/null
@@ -1 +0,0 @@
- Support SSO in the user interactive authentication workflow.
diff --git a/changelog.d/7286.misc b/changelog.d/7286.misc
deleted file mode 100644
index 676f28537..000000000
--- a/changelog.d/7286.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move catchup of replication streams logic to worker.
diff --git a/changelog.d/7290.misc b/changelog.d/7290.misc
deleted file mode 100644
index 676f28537..000000000
--- a/changelog.d/7290.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move catchup of replication streams logic to worker.
diff --git a/changelog.d/7291.misc b/changelog.d/7291.misc
deleted file mode 100644
index 02e7ae3fa..000000000
--- a/changelog.d/7291.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve typing annotations in `synapse.replication.tcp.streams.Stream`.
diff --git a/changelog.d/7295.misc b/changelog.d/7295.misc
deleted file mode 100644
index 239195e75..000000000
--- a/changelog.d/7295.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce log verbosity of url cache cleanup tasks.
diff --git a/changelog.d/7300.misc b/changelog.d/7300.misc
deleted file mode 100644
index 7b3bc362b..000000000
--- a/changelog.d/7300.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix sample SAML Service Provider configuration. Contributed by @frcl.
diff --git a/changelog.d/7302.bugfix b/changelog.d/7302.bugfix
deleted file mode 100644
index 820646d1f..000000000
--- a/changelog.d/7302.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Persist user interactive authentication sessions across workers and Synapse restarts.
diff --git a/changelog.d/7303.misc b/changelog.d/7303.misc
deleted file mode 100644
index aa89c2b25..000000000
--- a/changelog.d/7303.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix StreamChangeCache to work with multiple entities changing on the same stream id.
diff --git a/changelog.d/7315.feature b/changelog.d/7315.feature
deleted file mode 100644
index ebcb4741b..000000000
--- a/changelog.d/7315.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow `/requestToken` endpoints to hide the existence (or lack thereof) of 3PID associations on the homeserver.
diff --git a/changelog.d/7316.bugfix b/changelog.d/7316.bugfix
deleted file mode 100644
index 0692696c7..000000000
--- a/changelog.d/7316.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed backwards compatibility logic of the first value of `trusted_third_party_id_servers` being used for `account_threepid_delegates.email`, which occurs when the former, deprecated option is set and the latter is not.
\ No newline at end of file
diff --git a/changelog.d/7318.misc b/changelog.d/7318.misc
deleted file mode 100644
index 676f28537..000000000
--- a/changelog.d/7318.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move catchup of replication streams logic to worker.
diff --git a/changelog.d/7319.misc b/changelog.d/7319.misc
deleted file mode 100644
index 62ea6b6df..000000000
--- a/changelog.d/7319.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix an incorrect import in IdentityHandler.
\ No newline at end of file
diff --git a/changelog.d/7321.misc b/changelog.d/7321.misc
deleted file mode 100644
index a4b3e67af..000000000
--- a/changelog.d/7321.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce logging verbosity for successful federation requests.
diff --git a/changelog.d/7325.feature b/changelog.d/7325.feature
deleted file mode 100644
index ce6140fdd..000000000
--- a/changelog.d/7325.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for running replication over Redis when using workers.
diff --git a/changelog.d/7326.misc b/changelog.d/7326.misc
deleted file mode 100644
index 676f28537..000000000
--- a/changelog.d/7326.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move catchup of replication streams logic to worker.
diff --git a/changelog.d/7337.bugfix b/changelog.d/7337.bugfix
deleted file mode 100644
index f49c60017..000000000
--- a/changelog.d/7337.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where event updates might not be sent over replication to worker processes after the stream falls behind.
diff --git a/changelog.d/7338.misc b/changelog.d/7338.misc
deleted file mode 100644
index 7cafd074c..000000000
--- a/changelog.d/7338.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert some federation handler code to async/await.
diff --git a/changelog.d/7341.bugfix b/changelog.d/7341.bugfix
deleted file mode 100644
index 8f0958bcb..000000000
--- a/changelog.d/7341.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bad error handling that would cause Synapse to crash if it's provided with a YAML configuration file that's either empty or doesn't parse into a key-value map.
diff --git a/changelog.d/7343.feature b/changelog.d/7343.feature
deleted file mode 100644
index 01057aa39..000000000
--- a/changelog.d/7343.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support SSO in the user interactive authentication workflow.
diff --git a/changelog.d/7344.bugfix b/changelog.d/7344.bugfix
deleted file mode 100644
index 8c38f9ef8..000000000
--- a/changelog.d/7344.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix incorrect metrics reporting for `renew_attestations` background task.
diff --git a/changelog.d/7352.feature b/changelog.d/7352.feature
deleted file mode 100644
index ce6140fdd..000000000
--- a/changelog.d/7352.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for running replication over Redis when using workers.
diff --git a/changelog.d/7357.doc b/changelog.d/7357.doc
deleted file mode 100644
index a3d5616ad..000000000
--- a/changelog.d/7357.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add documentation on monitoring workers with Prometheus.
diff --git a/changelog.d/7358.bugfix b/changelog.d/7358.bugfix
deleted file mode 100644
index f49c60017..000000000
--- a/changelog.d/7358.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where event updates might not be sent over replication to worker processes after the stream falls behind.
diff --git a/changelog.d/7359.misc b/changelog.d/7359.misc
deleted file mode 100644
index b99f257d9..000000000
--- a/changelog.d/7359.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix collation for postgres for unit tests.
diff --git a/changelog.d/7361.doc b/changelog.d/7361.doc
deleted file mode 100644
index b35dbc36e..000000000
--- a/changelog.d/7361.doc
+++ /dev/null
@@ -1 +0,0 @@
-Clarify endpoint usage in the users admin api documentation.
\ No newline at end of file
diff --git a/changelog.d/7363.misc b/changelog.d/7363.misc
deleted file mode 100644
index 1e3cddde7..000000000
--- a/changelog.d/7363.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert RegistrationWorkerStore.is_server_admin and dependent code to async/await.
\ No newline at end of file
diff --git a/changelog.d/7364.misc b/changelog.d/7364.misc
deleted file mode 100644
index bb5d727cf..000000000
--- a/changelog.d/7364.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add an `instance_name` to `RDATA` and `POSITION` replication commands.
diff --git a/changelog.d/7367.bugfix b/changelog.d/7367.bugfix
deleted file mode 100644
index 12171d4e1..000000000
--- a/changelog.d/7367.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Prevent non-federating rooms from appearing in responses to federated `POST /publicRoom` requests when a filter was included.
diff --git a/changelog.d/7368.bugfix b/changelog.d/7368.bugfix
deleted file mode 100644
index efa8a40b1..000000000
--- a/changelog.d/7368.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Improve error responses when accessing remote public room lists.
\ No newline at end of file
diff --git a/changelog.d/7369.misc b/changelog.d/7369.misc
deleted file mode 100644
index 060b09c88..000000000
--- a/changelog.d/7369.misc
+++ /dev/null
@@ -1 +0,0 @@
-Thread through instance name to replication client.
diff --git a/changelog.d/7378.misc b/changelog.d/7378.misc
deleted file mode 100644
index 676f28537..000000000
--- a/changelog.d/7378.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move catchup of replication streams logic to worker.
diff --git a/changelog.d/7387.bugfix b/changelog.d/7387.bugfix
deleted file mode 100644
index a250517b4..000000000
--- a/changelog.d/7387.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug which would cause the room durectory to be incorrectly populated if Synapse was upgraded directly from v1.2.1 or earlier to v1.4.0 or later. Note that this fix does not apply retrospectively; see the [upgrade notes](UPGRADE.rst#upgrading-to-v1130) for more information.
diff --git a/changelog.d/7393.bugfix b/changelog.d/7393.bugfix
deleted file mode 100644
index 74419af85..000000000
--- a/changelog.d/7393.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug in `EventContext.deserialize`.
diff --git a/changelog.d/7394.misc b/changelog.d/7394.misc
deleted file mode 100644
index f1390308b..000000000
--- a/changelog.d/7394.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert synapse.server_notices to async/await.
diff --git a/changelog.d/7395.misc b/changelog.d/7395.misc
deleted file mode 100644
index bc0ad59e2..000000000
--- a/changelog.d/7395.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert synapse.notifier to async/await.
diff --git a/changelog.d/7401.feature b/changelog.d/7401.feature
deleted file mode 100644
index ce6140fdd..000000000
--- a/changelog.d/7401.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for running replication over Redis when using workers.
diff --git a/changelog.d/7404.misc b/changelog.d/7404.misc
deleted file mode 100644
index 9ac17958c..000000000
--- a/changelog.d/7404.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix issues with the Python package manifest.
diff --git a/changelog.d/7408.misc b/changelog.d/7408.misc
deleted file mode 100644
index 731f4dcb5..000000000
--- a/changelog.d/7408.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up some LoggingContext code.
diff --git a/changelog.d/7420.misc b/changelog.d/7420.misc
deleted file mode 100644
index e834a9163..000000000
--- a/changelog.d/7420.misc
+++ /dev/null
@@ -1 +0,0 @@
-Prevent methods in `synapse.handlers.auth` from polling the homeserver config every request.
\ No newline at end of file
diff --git a/changelog.d/7421.misc b/changelog.d/7421.misc
deleted file mode 100644
index 676f28537..000000000
--- a/changelog.d/7421.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move catchup of replication streams logic to worker.
diff --git a/changelog.d/7422.feature b/changelog.d/7422.feature
deleted file mode 100644
index d6d5bb216..000000000
--- a/changelog.d/7422.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a configuration setting to tweak the threshold for dummy events.
diff --git a/changelog.d/7423.misc b/changelog.d/7423.misc
deleted file mode 100644
index eb1767ac1..000000000
--- a/changelog.d/7423.misc
+++ /dev/null
@@ -1 +0,0 @@
-Speed up fetching device lists changes when handling `/sync` requests.
diff --git a/changelog.d/7426.misc b/changelog.d/7426.misc
deleted file mode 100644
index 731f4dcb5..000000000
--- a/changelog.d/7426.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up some LoggingContext code.
diff --git a/changelog.d/7427.feature b/changelog.d/7427.feature
deleted file mode 100644
index ce6140fdd..000000000
--- a/changelog.d/7427.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for running replication over Redis when using workers.
diff --git a/changelog.d/7439.feature b/changelog.d/7439.feature
deleted file mode 100644
index ce6140fdd..000000000
--- a/changelog.d/7439.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for running replication over Redis when using workers.
diff --git a/changelog.d/7442.misc b/changelog.d/7442.misc
deleted file mode 100644
index a8fd5ad80..000000000
--- a/changelog.d/7442.misc
+++ /dev/null
@@ -1 +0,0 @@
-Run group attestation renewal in series rather than parallel for performance.
\ No newline at end of file
diff --git a/changelog.d/7446.feature b/changelog.d/7446.feature
deleted file mode 100644
index ce6140fdd..000000000
--- a/changelog.d/7446.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for running replication over Redis when using workers.
diff --git a/changelog.d/7450.feature b/changelog.d/7450.feature
deleted file mode 100644
index ce6140fdd..000000000
--- a/changelog.d/7450.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for running replication over Redis when using workers.
diff --git a/changelog.d/7454.feature b/changelog.d/7454.feature
deleted file mode 100644
index ce6140fdd..000000000
--- a/changelog.d/7454.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for running replication over Redis when using workers.
diff --git a/changelog.d/7455.bugfix b/changelog.d/7455.bugfix
deleted file mode 100644
index d1693a7f2..000000000
--- a/changelog.d/7455.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ensure that a user inteactive authentication session is tied to a single request.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d8d340f42..6cd16a820 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.12.4"
+__version__ = "1.13.0rc1"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when