diff --git a/CHANGES.md b/CHANGES.md
index d6fa92d81ca53f19244ef4c83cf68c91bb124581..2aebe92cacd9127195509f1075b2a527e9cf17da 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,5 @@
-Synapse 1.25.0 (2020-xx-xx)
-===========================
+Synapse 1.25.0rc1 (2021-01-06)
+==============================
Removal warning
---------------
@@ -12,6 +12,92 @@ are deprecated and will be removed in a future release. They will be replaced by
`POST /_synapse/admin/v1/rooms/<room_id>/delete` replaces `POST /_synapse/admin/v1/purge_room` and
`POST /_synapse/admin/v1/shutdown_room/<room_id>`.
+Features
+--------
+
+- Add an admin API that lets server admins get power in rooms in which local users have power. ([\#8756](https://github.com/matrix-org/synapse/issues/8756))
+- Add optional HTTP authentication to replication endpoints. ([\#8853](https://github.com/matrix-org/synapse/issues/8853))
+- Improve the error messages printed as a result of configuration problems for extension modules. ([\#8874](https://github.com/matrix-org/synapse/issues/8874))
+- Add the number of local devices to Room Details Admin API. Contributed by @dklimpel. ([\#8886](https://github.com/matrix-org/synapse/issues/8886))
+- Add `X-Robots-Tag` header to stop web crawlers from indexing media. Contributed by Aaron Raimist. ([\#8887](https://github.com/matrix-org/synapse/issues/8887))
+- Spam-checkers may now define their methods as `async`. ([\#8890](https://github.com/matrix-org/synapse/issues/8890))
+- Add support for allowing users to pick their own user ID during a single-sign-on login. ([\#8897](https://github.com/matrix-org/synapse/issues/8897), [\#8900](https://github.com/matrix-org/synapse/issues/8900), [\#8911](https://github.com/matrix-org/synapse/issues/8911), [\#8938](https://github.com/matrix-org/synapse/issues/8938), [\#8941](https://github.com/matrix-org/synapse/issues/8941), [\#8942](https://github.com/matrix-org/synapse/issues/8942), [\#8951](https://github.com/matrix-org/synapse/issues/8951))
+- Add an `email.invite_client_location` configuration option to send a web client location to the invite endpoint on the identity server which allows customisation of the email template. ([\#8930](https://github.com/matrix-org/synapse/issues/8930))
+- The search term in the list room and list user Admin APIs is now treated as case-insensitive. ([\#8931](https://github.com/matrix-org/synapse/issues/8931))
+- Apply an IP range blacklist to push and key revocation requests. ([\#8821](https://github.com/matrix-org/synapse/issues/8821), [\#8870](https://github.com/matrix-org/synapse/issues/8870), [\#8954](https://github.com/matrix-org/synapse/issues/8954))
+- Add an option to allow re-use of user-interactive authentication sessions for a period of time. ([\#8970](https://github.com/matrix-org/synapse/issues/8970))
+- Allow running the redact endpoint on workers. ([\#8994](https://github.com/matrix-org/synapse/issues/8994))
+
+
+Bugfixes
+--------
+
+- Fix bug where we might not correctly calculate the current state for rooms with multiple extremities. ([\#8827](https://github.com/matrix-org/synapse/issues/8827))
+- Fix a long-standing bug in the register admin endpoint (`/_synapse/admin/v1/register`) when the `mac` field was not provided. The endpoint now properly returns a 400 error. Contributed by @edwargix. ([\#8837](https://github.com/matrix-org/synapse/issues/8837))
+- Fix a long-standing bug on Synapse instances supporting Single-Sign-On, where users would be prompted to enter their password to confirm certain actions, even though they have not set a password. ([\#8858](https://github.com/matrix-org/synapse/issues/8858))
+- Fix a longstanding bug where a 500 error would be returned if the `Content-Length` header was not provided to the upload media resource. ([\#8862](https://github.com/matrix-org/synapse/issues/8862))
+- Add additional validation to pusher URLs to be compliant with the specification. ([\#8865](https://github.com/matrix-org/synapse/issues/8865))
+- Fix the error code that is returned when a user tries to register on a homeserver on which new-user registration has been disabled. ([\#8867](https://github.com/matrix-org/synapse/issues/8867))
+- Fix a bug where `PUT /_synapse/admin/v2/users/<user_id>` failed to create a new user when `avatar_url` is specified. Bug introduced in Synapse v1.9.0. ([\#8872](https://github.com/matrix-org/synapse/issues/8872))
+- Fix a 500 error when attempting to preview an empty HTML file. ([\#8883](https://github.com/matrix-org/synapse/issues/8883))
+- Fix occasional deadlock when handling SIGHUP. ([\#8918](https://github.com/matrix-org/synapse/issues/8918))
+- Fix login API to not ratelimit application services that have ratelimiting disabled. ([\#8920](https://github.com/matrix-org/synapse/issues/8920))
+- Fix bug where we ratelimited auto joining of rooms on registration (using `auto_join_rooms` config). ([\#8921](https://github.com/matrix-org/synapse/issues/8921))
+- Fix a bug where deactivated users appeared in the user directory when their profile information was updated. ([\#8933](https://github.com/matrix-org/synapse/issues/8933), [\#8964](https://github.com/matrix-org/synapse/issues/8964))
+- Fix bug introduced in Synapse v1.24.0 which would cause an exception on startup if both `enabled` and `localdb_enabled` were set to `False` in the `password_config` setting of the configuration file. ([\#8937](https://github.com/matrix-org/synapse/issues/8937))
+- Fix a bug where 500 errors would be returned if the `m.room_history_visibility` event had invalid content. ([\#8945](https://github.com/matrix-org/synapse/issues/8945))
+- Fix a bug causing common English words to not be considered for a user directory search. ([\#8959](https://github.com/matrix-org/synapse/issues/8959))
+- Fix bug where application services couldn't register new ghost users if the server had reached its MAU limit. ([\#8962](https://github.com/matrix-org/synapse/issues/8962))
+- Fix a long-standing bug where a `m.image` event without a `url` would cause errors on push. ([\#8965](https://github.com/matrix-org/synapse/issues/8965))
+- Fix a small bug in v2 state resolution algorithm, which could also cause performance issues for rooms with large numbers of power levels. ([\#8971](https://github.com/matrix-org/synapse/issues/8971))
+- Add validation to the `sendToDevice` API to raise a missing parameters error instead of a 500 error. ([\#8975](https://github.com/matrix-org/synapse/issues/8975))
+- Add validation of group IDs to raise a 400 error instead of a 500 eror. ([\#8977](https://github.com/matrix-org/synapse/issues/8977))
+
+
+Improved Documentation
+----------------------
+
+- Fix the "Event persist rate" section of the included grafana dashboard by adding missing prometheus rules. ([\#8802](https://github.com/matrix-org/synapse/issues/8802))
+- Combine related media admin API docs. ([\#8839](https://github.com/matrix-org/synapse/issues/8839))
+- Fix an error in the documentation for the SAML username mapping provider. ([\#8873](https://github.com/matrix-org/synapse/issues/8873))
+- Clarify comments around template directories in `sample_config.yaml`. ([\#8891](https://github.com/matrix-org/synapse/issues/8891))
+- Moved instructions for database setup, adjusted heading levels and improved syntax highlighting in [INSTALL.md](../INSTALL.md). Contributed by fossterer. ([\#8987](https://github.com/matrix-org/synapse/issues/8987))
+- Update the example value of `group_creation_prefix` in the sample configuration. ([\#8992](https://github.com/matrix-org/synapse/issues/8992))
+- Link the Synapse developer room to the development section in the docs. ([\#9002](https://github.com/matrix-org/synapse/issues/9002))
+
+
+Deprecations and Removals
+-------------------------
+
+- Deprecate Shutdown Room and Purge Room Admin APIs. ([\#8829](https://github.com/matrix-org/synapse/issues/8829))
+
+
+Internal Changes
+----------------
+
+- Properly store the mapping of external ID to Matrix ID for CAS users. ([\#8856](https://github.com/matrix-org/synapse/issues/8856), [\#8958](https://github.com/matrix-org/synapse/issues/8958))
+- Remove some unnecessary stubbing from unit tests. ([\#8861](https://github.com/matrix-org/synapse/issues/8861))
+- Remove unused `FakeResponse` class from unit tests. ([\#8864](https://github.com/matrix-org/synapse/issues/8864))
+- Pass `room_id` to `get_auth_chain_difference`. ([\#8879](https://github.com/matrix-org/synapse/issues/8879))
+- Add type hints to push module. ([\#8880](https://github.com/matrix-org/synapse/issues/8880), [\#8882](https://github.com/matrix-org/synapse/issues/8882), [\#8901](https://github.com/matrix-org/synapse/issues/8901), [\#8940](https://github.com/matrix-org/synapse/issues/8940), [\#8943](https://github.com/matrix-org/synapse/issues/8943), [\#9020](https://github.com/matrix-org/synapse/issues/9020))
+- Simplify logic for handling user-interactive-auth via single-sign-on servers. ([\#8881](https://github.com/matrix-org/synapse/issues/8881))
+- Skip the SAML tests if the requirements (`pysaml2` and `xmlsec1`) aren't available. ([\#8905](https://github.com/matrix-org/synapse/issues/8905))
+- Fix multiarch docker image builds. ([\#8906](https://github.com/matrix-org/synapse/issues/8906))
+- Don't publish `latest` docker image until all archs are built. ([\#8909](https://github.com/matrix-org/synapse/issues/8909))
+- Various clean-ups to the structured logging and logging context code. ([\#8916](https://github.com/matrix-org/synapse/issues/8916), [\#8935](https://github.com/matrix-org/synapse/issues/8935))
+- Automatically drop stale forward-extremities under some specific conditions. ([\#8929](https://github.com/matrix-org/synapse/issues/8929))
+- Refactor test utilities for injecting HTTP requests. ([\#8946](https://github.com/matrix-org/synapse/issues/8946))
+- Add a maximum size of 50 kilobytes to .well-known lookups. ([\#8950](https://github.com/matrix-org/synapse/issues/8950))
+- Fix bug in `generate_log_config` script which made it write empty files. ([\#8952](https://github.com/matrix-org/synapse/issues/8952))
+- Clean up tox.ini file; disable coverage checking for non-test runs. ([\#8963](https://github.com/matrix-org/synapse/issues/8963))
+- Add type hints to the admin and room list handlers. ([\#8973](https://github.com/matrix-org/synapse/issues/8973))
+- Add type hints to the receipts and user directory handlers. ([\#8976](https://github.com/matrix-org/synapse/issues/8976))
+- Drop the unused `local_invites` table. ([\#8979](https://github.com/matrix-org/synapse/issues/8979))
+- Add type hints to the base storage code. ([\#8980](https://github.com/matrix-org/synapse/issues/8980))
+- Support using PyJWT v2.0.0 in the test suite. ([\#8986](https://github.com/matrix-org/synapse/issues/8986))
+- Fix `tests.federation.transport.RoomDirectoryFederationTests` and ensure it runs in CI. ([\#8998](https://github.com/matrix-org/synapse/issues/8998))
+- Add type hints to the crypto module. ([\#8999](https://github.com/matrix-org/synapse/issues/8999))
+
Synapse 1.24.0 (2020-12-09)
===========================
diff --git a/changelog.d/8756.feature b/changelog.d/8756.feature
deleted file mode 100644
index 03eb79fb0a9d4d197ee527140f4a90cb31bfaac4..0000000000000000000000000000000000000000
--- a/changelog.d/8756.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add admin API that lets server admins get power in rooms in which local users have power.
diff --git a/changelog.d/8802.doc b/changelog.d/8802.doc
deleted file mode 100644
index 580c4281f8cbf808f9b0176708231626e959405c..0000000000000000000000000000000000000000
--- a/changelog.d/8802.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix the "Event persist rate" section of the included grafana dashboard by adding missing prometheus rules.
diff --git a/changelog.d/8821.bugfix b/changelog.d/8821.bugfix
deleted file mode 100644
index 39f53174ad83b0350c28a6031402bb24e7b9141f..0000000000000000000000000000000000000000
--- a/changelog.d/8821.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Apply an IP range blacklist to push and key revocation requests.
diff --git a/changelog.d/8827.bugfix b/changelog.d/8827.bugfix
deleted file mode 100644
index 18195680d39a3f025d8684a3693321c308a58033..0000000000000000000000000000000000000000
--- a/changelog.d/8827.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where we might not correctly calculate the current state for rooms with multiple extremities.
diff --git a/changelog.d/8829.removal b/changelog.d/8829.removal
deleted file mode 100644
index 2f3708218b5f85b6dfd649d1ece4b299d617e539..0000000000000000000000000000000000000000
--- a/changelog.d/8829.removal
+++ /dev/null
@@ -1 +0,0 @@
-Deprecate Shutdown Room and Purge Room Admin APIs.
diff --git a/changelog.d/8837.bugfix b/changelog.d/8837.bugfix
deleted file mode 100644
index b2977d0c312eda8dd9a093e47d741d374f0f51f1..0000000000000000000000000000000000000000
--- a/changelog.d/8837.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long standing bug in the register admin endpoint (`/_synapse/admin/v1/register`) when the `mac` field was not provided. The endpoint now properly returns a 400 error. Contributed by @edwargix.
diff --git a/changelog.d/8839.doc b/changelog.d/8839.doc
deleted file mode 100644
index c35c59a7638fe7fed9ebea6c6137f4587da4e740..0000000000000000000000000000000000000000
--- a/changelog.d/8839.doc
+++ /dev/null
@@ -1 +0,0 @@
-Combine related media admin API docs.
\ No newline at end of file
diff --git a/changelog.d/8853.feature b/changelog.d/8853.feature
deleted file mode 100644
index 63c59f4ff236854c87379666406fb6c7af4ef975..0000000000000000000000000000000000000000
--- a/changelog.d/8853.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add optional HTTP authentication to replication endpoints.
diff --git a/changelog.d/8856.misc b/changelog.d/8856.misc
deleted file mode 100644
index 1507073e4f520df62295487a3619824f21e19396..0000000000000000000000000000000000000000
--- a/changelog.d/8856.misc
+++ /dev/null
@@ -1 +0,0 @@
-Properly store the mapping of external ID to Matrix ID for CAS users.
diff --git a/changelog.d/8858.bugfix b/changelog.d/8858.bugfix
deleted file mode 100644
index 0d58cb9abca055a9ac6283b62c48f0b07cf1caaf..0000000000000000000000000000000000000000
--- a/changelog.d/8858.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug on Synapse instances supporting Single-Sign-On, where users would be prompted to enter their password to confirm certain actions, even though they have not set a password.
diff --git a/changelog.d/8861.misc b/changelog.d/8861.misc
deleted file mode 100644
index 9821f804cfd5826ac094961f01861306a52a2435..0000000000000000000000000000000000000000
--- a/changelog.d/8861.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove some unnecessary stubbing from unit tests.
diff --git a/changelog.d/8862.bugfix b/changelog.d/8862.bugfix
deleted file mode 100644
index bdbd633f7234b53b3c91500bdf20a8d5cb63168e..0000000000000000000000000000000000000000
--- a/changelog.d/8862.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a longstanding bug where a 500 error would be returned if the `Content-Length` header was not provided to the upload media resource.
diff --git a/changelog.d/8864.misc b/changelog.d/8864.misc
deleted file mode 100644
index a78088349521f2aed53d473644ecf40e14ea1357..0000000000000000000000000000000000000000
--- a/changelog.d/8864.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove unused `FakeResponse` class from unit tests.
diff --git a/changelog.d/8865.bugfix b/changelog.d/8865.bugfix
deleted file mode 100644
index a1e625f55253a031b7ce71953de866e08f9db79e..0000000000000000000000000000000000000000
--- a/changelog.d/8865.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add additional validation to pusher URLs to be compliant with the specification.
diff --git a/changelog.d/8867.bugfix b/changelog.d/8867.bugfix
deleted file mode 100644
index f2414ff1110ff7b8b79eb815738cedaae79c2144..0000000000000000000000000000000000000000
--- a/changelog.d/8867.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix the error code that is returned when a user tries to register on a homeserver on which new-user registration has been disabled.
diff --git a/changelog.d/8870.bugfix b/changelog.d/8870.bugfix
deleted file mode 100644
index 39f53174ad83b0350c28a6031402bb24e7b9141f..0000000000000000000000000000000000000000
--- a/changelog.d/8870.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Apply an IP range blacklist to push and key revocation requests.
diff --git a/changelog.d/8872.bugfix b/changelog.d/8872.bugfix
deleted file mode 100644
index ed00b70a0fccde29388ea47d92c5ec014c5d93bc..0000000000000000000000000000000000000000
--- a/changelog.d/8872.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where `PUT /_synapse/admin/v2/users/<user_id>` failed to create a new user when `avatar_url` is specified. Bug introduced in Synapse v1.9.0.
diff --git a/changelog.d/8873.doc b/changelog.d/8873.doc
deleted file mode 100644
index 0c2a043bd1660ffddced57f33f43a7f85c11ef7f..0000000000000000000000000000000000000000
--- a/changelog.d/8873.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix an error in the documentation for the SAML username mapping provider.
diff --git a/changelog.d/8874.feature b/changelog.d/8874.feature
deleted file mode 100644
index 720665ecac3abbf0eb7e18f40f27e6ba5e306323..0000000000000000000000000000000000000000
--- a/changelog.d/8874.feature
+++ /dev/null
@@ -1 +0,0 @@
-Improve the error messages printed as a result of configuration problems for extension modules.
diff --git a/changelog.d/8879.misc b/changelog.d/8879.misc
deleted file mode 100644
index 6f9516b314c5984ce3176a9f1ed57201d3592227..0000000000000000000000000000000000000000
--- a/changelog.d/8879.misc
+++ /dev/null
@@ -1 +0,0 @@
-Pass `room_id` to `get_auth_chain_difference`.
diff --git a/changelog.d/8880.misc b/changelog.d/8880.misc
deleted file mode 100644
index 4ff0b94b9496c76cc37a4b6e7976a808e2a14468..0000000000000000000000000000000000000000
--- a/changelog.d/8880.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type hints to push module.
diff --git a/changelog.d/8881.misc b/changelog.d/8881.misc
deleted file mode 100644
index 07d3f30fb22bf99394778f0c29bd74c0bb88d323..0000000000000000000000000000000000000000
--- a/changelog.d/8881.misc
+++ /dev/null
@@ -1 +0,0 @@
-Simplify logic for handling user-interactive-auth via single-sign-on servers.
diff --git a/changelog.d/8882.misc b/changelog.d/8882.misc
deleted file mode 100644
index 4ff0b94b9496c76cc37a4b6e7976a808e2a14468..0000000000000000000000000000000000000000
--- a/changelog.d/8882.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type hints to push module.
diff --git a/changelog.d/8883.bugfix b/changelog.d/8883.bugfix
deleted file mode 100644
index 6137fc5b2b42f1fb7ee0970148bfd5a522240067..0000000000000000000000000000000000000000
--- a/changelog.d/8883.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a 500 error when attempting to preview an empty HTML file.
diff --git a/changelog.d/8886.feature b/changelog.d/8886.feature
deleted file mode 100644
index 9e446f28bda29682b0ecbf65ffaa9e18528f9325..0000000000000000000000000000000000000000
--- a/changelog.d/8886.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add number of local devices to Room Details Admin API. Contributed by @dklimpel.
\ No newline at end of file
diff --git a/changelog.d/8887.feature b/changelog.d/8887.feature
deleted file mode 100644
index 729eb1f1ea344af9d17e70b9f71d0644cbccb970..0000000000000000000000000000000000000000
--- a/changelog.d/8887.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add `X-Robots-Tag` header to stop web crawlers from indexing media.
diff --git a/changelog.d/8890.feature b/changelog.d/8890.feature
deleted file mode 100644
index 97aa72a76e0b248265a5bbabe54999731f58b795..0000000000000000000000000000000000000000
--- a/changelog.d/8890.feature
+++ /dev/null
@@ -1 +0,0 @@
-Spam-checkers may now define their methods as `async`.
diff --git a/changelog.d/8891.doc b/changelog.d/8891.doc
deleted file mode 100644
index c3947fe7c2eb3b27e2de8b3d44821ddc95dc0082..0000000000000000000000000000000000000000
--- a/changelog.d/8891.doc
+++ /dev/null
@@ -1 +0,0 @@
-Clarify comments around template directories in `sample_config.yaml`.
diff --git a/changelog.d/8897.feature b/changelog.d/8897.feature
deleted file mode 100644
index d450ef4998d9eb4658461e30ea5353f0872274c8..0000000000000000000000000000000000000000
--- a/changelog.d/8897.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for allowing users to pick their own user ID during a single-sign-on login.
diff --git a/changelog.d/8900.feature b/changelog.d/8900.feature
deleted file mode 100644
index d450ef4998d9eb4658461e30ea5353f0872274c8..0000000000000000000000000000000000000000
--- a/changelog.d/8900.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for allowing users to pick their own user ID during a single-sign-on login.
diff --git a/changelog.d/8901.misc b/changelog.d/8901.misc
deleted file mode 100644
index 4ff0b94b9496c76cc37a4b6e7976a808e2a14468..0000000000000000000000000000000000000000
--- a/changelog.d/8901.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type hints to push module.
diff --git a/changelog.d/8905.misc b/changelog.d/8905.misc
deleted file mode 100644
index a9a11a2303703be0650596a90ff5dc97ac49566c..0000000000000000000000000000000000000000
--- a/changelog.d/8905.misc
+++ /dev/null
@@ -1 +0,0 @@
-Skip the SAML tests if the requirements (`pysaml2` and `xmlsec1`) aren't available.
diff --git a/changelog.d/8906.misc b/changelog.d/8906.misc
deleted file mode 100644
index 8b95e4c5530e5d751ac3f55376d5d097c1427a1c..0000000000000000000000000000000000000000
--- a/changelog.d/8906.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix multiarch docker image builds.
diff --git a/changelog.d/8909.misc b/changelog.d/8909.misc
deleted file mode 100644
index b45972f0fad72ad6f2db72879b67a237afdb2bd9..0000000000000000000000000000000000000000
--- a/changelog.d/8909.misc
+++ /dev/null
@@ -1 +0,0 @@
-Don't publish `latest` docker image until all archs are built.
diff --git a/changelog.d/8911.feature b/changelog.d/8911.feature
deleted file mode 100644
index d450ef4998d9eb4658461e30ea5353f0872274c8..0000000000000000000000000000000000000000
--- a/changelog.d/8911.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for allowing users to pick their own user ID during a single-sign-on login.
diff --git a/changelog.d/8916.misc b/changelog.d/8916.misc
deleted file mode 100644
index bf94135fd5b4fa29e895caabedb5d9df8d9cb13a..0000000000000000000000000000000000000000
--- a/changelog.d/8916.misc
+++ /dev/null
@@ -1 +0,0 @@
-Various clean-ups to the structured logging and logging context code.
diff --git a/changelog.d/8918.bugfix b/changelog.d/8918.bugfix
deleted file mode 100644
index ae0f6745d7a99e274814629b98640a4580d30999..0000000000000000000000000000000000000000
--- a/changelog.d/8918.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix occasional deadlock when handling SIGHUP.
diff --git a/changelog.d/8920.bugfix b/changelog.d/8920.bugfix
deleted file mode 100644
index abcf186bda59f0d653de2000c56ee9943939075e..0000000000000000000000000000000000000000
--- a/changelog.d/8920.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix login API to not ratelimit application services that have ratelimiting disabled.
diff --git a/changelog.d/8921.bugfix b/changelog.d/8921.bugfix
deleted file mode 100644
index 7f6f0b8a76afa79e63aa5c848f132276a39f9bc0..0000000000000000000000000000000000000000
--- a/changelog.d/8921.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where we ratelimited auto joining of rooms on registration (using `auto_join_rooms` config).
diff --git a/changelog.d/8929.misc b/changelog.d/8929.misc
deleted file mode 100644
index 157018b6a6868a00a3e136b15504c797749f5ba1..0000000000000000000000000000000000000000
--- a/changelog.d/8929.misc
+++ /dev/null
@@ -1 +0,0 @@
-Automatically drop stale forward-extremities under some specific conditions.
diff --git a/changelog.d/8930.feature b/changelog.d/8930.feature
deleted file mode 100644
index cb305b5266781d7740a1494a08a8d3c7b8e3fe14..0000000000000000000000000000000000000000
--- a/changelog.d/8930.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add an `email.invite_client_location` configuration option to send a web client location to the invite endpoint on the identity server which allows customisation of the email template.
diff --git a/changelog.d/8931.feature b/changelog.d/8931.feature
deleted file mode 100644
index 35c720eb8cb203da192227a9f1662eef2b7a726c..0000000000000000000000000000000000000000
--- a/changelog.d/8931.feature
+++ /dev/null
@@ -1 +0,0 @@
-Make search statement in List Room and List User Admin API case-insensitive.
\ No newline at end of file
diff --git a/changelog.d/8933.bugfix b/changelog.d/8933.bugfix
deleted file mode 100644
index 295933d6cd4e9841fd34c29820dc97f5ff34d102..0000000000000000000000000000000000000000
--- a/changelog.d/8933.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where deactivated users appeared in the user directory when their profile information was updated.
diff --git a/changelog.d/8935.misc b/changelog.d/8935.misc
deleted file mode 100644
index bf94135fd5b4fa29e895caabedb5d9df8d9cb13a..0000000000000000000000000000000000000000
--- a/changelog.d/8935.misc
+++ /dev/null
@@ -1 +0,0 @@
-Various clean-ups to the structured logging and logging context code.
diff --git a/changelog.d/8937.bugfix b/changelog.d/8937.bugfix
deleted file mode 100644
index 01e18484489349b70e6428f50541dfde1834adcc..0000000000000000000000000000000000000000
--- a/changelog.d/8937.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug introduced in Synapse v1.24.0 which would cause an exception on startup if both `enabled` and `localdb_enabled` were set to `False` in the `password_config` setting of the configuration file.
diff --git a/changelog.d/8938.feature b/changelog.d/8938.feature
deleted file mode 100644
index d450ef4998d9eb4658461e30ea5353f0872274c8..0000000000000000000000000000000000000000
--- a/changelog.d/8938.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for allowing users to pick their own user ID during a single-sign-on login.
diff --git a/changelog.d/8940.misc b/changelog.d/8940.misc
deleted file mode 100644
index 4ff0b94b9496c76cc37a4b6e7976a808e2a14468..0000000000000000000000000000000000000000
--- a/changelog.d/8940.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type hints to push module.
diff --git a/changelog.d/8941.feature b/changelog.d/8941.feature
deleted file mode 100644
index d450ef4998d9eb4658461e30ea5353f0872274c8..0000000000000000000000000000000000000000
--- a/changelog.d/8941.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for allowing users to pick their own user ID during a single-sign-on login.
diff --git a/changelog.d/8942.feature b/changelog.d/8942.feature
deleted file mode 100644
index d450ef4998d9eb4658461e30ea5353f0872274c8..0000000000000000000000000000000000000000
--- a/changelog.d/8942.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for allowing users to pick their own user ID during a single-sign-on login.
diff --git a/changelog.d/8943.misc b/changelog.d/8943.misc
deleted file mode 100644
index 4ff0b94b9496c76cc37a4b6e7976a808e2a14468..0000000000000000000000000000000000000000
--- a/changelog.d/8943.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type hints to push module.
diff --git a/changelog.d/8945.bugfix b/changelog.d/8945.bugfix
deleted file mode 100644
index f9e6dbba56e06fe922a22f7c63b334c8781308f2..0000000000000000000000000000000000000000
--- a/changelog.d/8945.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where 500 errors would be returned if the `m.room_history_visibility` event had invalid content.
diff --git a/changelog.d/8946.misc b/changelog.d/8946.misc
deleted file mode 100644
index 54502e9b9029e801eb3b469eb3c51193b23d8765..0000000000000000000000000000000000000000
--- a/changelog.d/8946.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor test utilities for injecting HTTP requests.
diff --git a/changelog.d/8950.misc b/changelog.d/8950.misc
deleted file mode 100644
index 42e0335afc5e8b6f64318055faee3791166d5d42..0000000000000000000000000000000000000000
--- a/changelog.d/8950.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a maximum size of 50 kilobytes to .well-known lookups.
diff --git a/changelog.d/8951.feature b/changelog.d/8951.feature
deleted file mode 100644
index d450ef4998d9eb4658461e30ea5353f0872274c8..0000000000000000000000000000000000000000
--- a/changelog.d/8951.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for allowing users to pick their own user ID during a single-sign-on login.
diff --git a/changelog.d/8952.misc b/changelog.d/8952.misc
deleted file mode 100644
index 4c4a874649cc187f757e7010fbbe25dcb1113894..0000000000000000000000000000000000000000
--- a/changelog.d/8952.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug in `generate_log_config` script which made it write empty files.
diff --git a/changelog.d/8954.feature b/changelog.d/8954.feature
deleted file mode 100644
index 39f53174ad83b0350c28a6031402bb24e7b9141f..0000000000000000000000000000000000000000
--- a/changelog.d/8954.feature
+++ /dev/null
@@ -1 +0,0 @@
-Apply an IP range blacklist to push and key revocation requests.
diff --git a/changelog.d/8958.misc b/changelog.d/8958.misc
deleted file mode 100644
index 1507073e4f520df62295487a3619824f21e19396..0000000000000000000000000000000000000000
--- a/changelog.d/8958.misc
+++ /dev/null
@@ -1 +0,0 @@
-Properly store the mapping of external ID to Matrix ID for CAS users.
diff --git a/changelog.d/8959.bugfix b/changelog.d/8959.bugfix
deleted file mode 100644
index 772818bae933471628c9d3452e5cd76096ae4cf9..0000000000000000000000000000000000000000
--- a/changelog.d/8959.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug causing common English words to not be considered for a user directory search.
diff --git a/changelog.d/8962.bugfix b/changelog.d/8962.bugfix
deleted file mode 100644
index af1a5e4c3a9d8470fa867983999cf01f2def3299..0000000000000000000000000000000000000000
--- a/changelog.d/8962.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where application services couldn't register new ghost users if the server had reached its MAU limit.
diff --git a/changelog.d/8963.misc b/changelog.d/8963.misc
deleted file mode 100644
index 495d89e8eebd3ee5f7706f004e8a451526bde087..0000000000000000000000000000000000000000
--- a/changelog.d/8963.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up tox.ini file; disable coverage checking for non-test runs.
diff --git a/changelog.d/8964.bugfix b/changelog.d/8964.bugfix
deleted file mode 100644
index 295933d6cd4e9841fd34c29820dc97f5ff34d102..0000000000000000000000000000000000000000
--- a/changelog.d/8964.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where deactivated users appeared in the user directory when their profile information was updated.
diff --git a/changelog.d/8965.bugfix b/changelog.d/8965.bugfix
deleted file mode 100644
index cbccebddb5dafb52fb1ed8461647183338676779..0000000000000000000000000000000000000000
--- a/changelog.d/8965.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a longstanding bug where a `m.image` event without a `url` would cause errors on push.
diff --git a/changelog.d/8970.feature b/changelog.d/8970.feature
deleted file mode 100644
index 6d5b3303a640654294137bf1d68c417bffcdb02d..0000000000000000000000000000000000000000
--- a/changelog.d/8970.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow re-using an user-interactive authentication session for a period of time.
diff --git a/changelog.d/8971.bugfix b/changelog.d/8971.bugfix
deleted file mode 100644
index c3e44b8c0b066af5a73ad1cd45cc0fe5543bae5c..0000000000000000000000000000000000000000
--- a/changelog.d/8971.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix small bug in v2 state resolution algorithm, which could also cause performance issues for rooms with large numbers of power levels.
diff --git a/changelog.d/8973.misc b/changelog.d/8973.misc
deleted file mode 100644
index be744f5dc789f9ff753d16b0d0ff5e64df59633b..0000000000000000000000000000000000000000
--- a/changelog.d/8973.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type hints to the admin and room list handlers.
diff --git a/changelog.d/8975.bugfix b/changelog.d/8975.bugfix
deleted file mode 100644
index 75049b8e18b91f34707d5b7b52fb4db5583720c4..0000000000000000000000000000000000000000
--- a/changelog.d/8975.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add validation to the `sendToDevice` API to raise a missing parameters error instead of a 500 error.
diff --git a/changelog.d/8976.misc b/changelog.d/8976.misc
deleted file mode 100644
index 4f4b083b1e344888f6a5c038e654e66ef067c6f5..0000000000000000000000000000000000000000
--- a/changelog.d/8976.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type hints to the receipts and user directory handlers.
diff --git a/changelog.d/8977.bugfix b/changelog.d/8977.bugfix
deleted file mode 100644
index ae0b6bec147f2af88f8e4b3bf8ed6a5f74b41308..0000000000000000000000000000000000000000
--- a/changelog.d/8977.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Properly return 400 errors on invalid group IDs.
diff --git a/changelog.d/8979.misc b/changelog.d/8979.misc
deleted file mode 100644
index 670821cf90509c65da571ee4e2daca658931d1ac..0000000000000000000000000000000000000000
--- a/changelog.d/8979.misc
+++ /dev/null
@@ -1 +0,0 @@
-Drop the unused `local_invites` table.
diff --git a/changelog.d/8980.misc b/changelog.d/8980.misc
deleted file mode 100644
index 83ef3c5def4bc7e7055ded6141ebaac3371e16a7..0000000000000000000000000000000000000000
--- a/changelog.d/8980.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type hints to the base storage code.
diff --git a/changelog.d/8986.misc b/changelog.d/8986.misc
deleted file mode 100644
index 6aefc7878489e66e535d75f72ded5506f3e543db..0000000000000000000000000000000000000000
--- a/changelog.d/8986.misc
+++ /dev/null
@@ -1 +0,0 @@
-Support using PyJWT v2.0.0 in the test suite.
diff --git a/changelog.d/8987.doc b/changelog.d/8987.doc
deleted file mode 100644
index c6e49327293e9dabfebf4d245fab377fa7b85c69..0000000000000000000000000000000000000000
--- a/changelog.d/8987.doc
+++ /dev/null
@@ -1 +0,0 @@
-Moved instructions for database setup, adjusted heading levels and improved syntax highlighting in [INSTALL.md](../INSTALL.md). Contributed by fossterer.
diff --git a/changelog.d/8992.doc b/changelog.d/8992.doc
deleted file mode 100644
index 6a47bda26b2e957e553ae3bb02d4456e60fe024b..0000000000000000000000000000000000000000
--- a/changelog.d/8992.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update the example value of `group_creation_prefix` in the sample configuration.
diff --git a/changelog.d/8994.feature b/changelog.d/8994.feature
deleted file mode 100644
index 76aeb185cb6392fe57c3770ee8b26376bd325f80..0000000000000000000000000000000000000000
--- a/changelog.d/8994.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow running the redact endpoint on workers.
diff --git a/changelog.d/8998.misc b/changelog.d/8998.misc
deleted file mode 100644
index 81346694bd3a47d63d32d837955c413ccb9f68d6..0000000000000000000000000000000000000000
--- a/changelog.d/8998.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix `tests.federation.transport.RoomDirectoryFederationTests` and ensure it runs in CI.
\ No newline at end of file
diff --git a/changelog.d/8999.misc b/changelog.d/8999.misc
deleted file mode 100644
index 3987204f06a0b50b97a1c315f1d99999b6e465cc..0000000000000000000000000000000000000000
--- a/changelog.d/8999.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type hints to the crypto module.
diff --git a/changelog.d/9002.doc b/changelog.d/9002.doc
deleted file mode 100644
index 26928c9a93bb5c23357956decab3e62a0d9e3add..0000000000000000000000000000000000000000
--- a/changelog.d/9002.doc
+++ /dev/null
@@ -1 +0,0 @@
-Link the Synapse developer room to the development section in the docs.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index f2d3ac68eba999dffeaaba6d24976a9642b12af4..99fb675748392ee00c6e6fa8b1682a66b530d408 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
except ImportError:
pass
-__version__ = "1.24.0"
+__version__ = "1.25.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
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py
index 9e7ac149a13692b2a1e50098e3a0ea9abb5d78f6..f4f7ec96f8262d9203e71d11a24fe7b6b047c2bf 100644
--- a/synapse/push/__init__.py
+++ b/synapse/push/__init__.py
@@ -40,7 +40,7 @@ class PusherConfig:
ts = attr.ib(type=int)
lang = attr.ib(type=Optional[str])
data = attr.ib(type=Optional[JsonDict])
- last_stream_ordering = attr.ib(type=Optional[int])
+ last_stream_ordering = attr.ib(type=int)
last_success = attr.ib(type=Optional[int])
failing_since = attr.ib(type=Optional[int])
diff --git a/synapse/push/emailpusher.py b/synapse/push/emailpusher.py
index d2eff75a5885cb916d34e47f64e9732369e39b26..4ac1b317483294b159feef25fc97411a27f35488 100644
--- a/synapse/push/emailpusher.py
+++ b/synapse/push/emailpusher.py
@@ -157,7 +157,6 @@ class EmailPusher(Pusher):
being run.
"""
start = 0 if INCLUDE_ALL_UNREAD_NOTIFS else self.last_stream_ordering
- assert start is not None
unprocessed = await self.store.get_unread_push_actions_for_user_in_range_for_email(
self.user_id, start, self.max_stream_ordering
)
@@ -220,12 +219,8 @@ class EmailPusher(Pusher):
)
async def save_last_stream_ordering_and_success(
- self, last_stream_ordering: Optional[int]
+ self, last_stream_ordering: int
) -> None:
- if last_stream_ordering is None:
- # This happens if we haven't yet processed anything
- return
-
self.last_stream_ordering = last_stream_ordering
pusher_still_exists = await self.store.update_pusher_last_stream_ordering_and_success(
self.app_id,
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py
index 417fe0f1f571734d017f4cf5b4d1619e9bad3016..e048b0d59ee1458d86d077fb962c0e282a577f56 100644
--- a/synapse/push/httppusher.py
+++ b/synapse/push/httppusher.py
@@ -176,7 +176,6 @@ class HttpPusher(Pusher):
Never call this directly: use _process which will only allow this to
run once per pusher.
"""
- assert self.last_stream_ordering is not None
unprocessed = await self.store.get_unread_push_actions_for_user_in_range_for_http(
self.user_id, self.last_stream_ordering, self.max_stream_ordering
)
@@ -205,7 +204,6 @@ class HttpPusher(Pusher):
http_push_processed_counter.inc()
self.backoff_delay = HttpPusher.INITIAL_BACKOFF_SEC
self.last_stream_ordering = push_action["stream_ordering"]
- assert self.last_stream_ordering is not None
pusher_still_exists = await self.store.update_pusher_last_stream_ordering_and_success(
self.app_id,
self.pushkey,
diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py
index 8158356d40cd1a7c1cf7122d936d3b6731989275..eed16dbfb5c188a183de34edc33689ca7c949c92 100644
--- a/synapse/push/pusherpool.py
+++ b/synapse/push/pusherpool.py
@@ -106,6 +106,10 @@ class PusherPool:
time_now_msec = self.clock.time_msec()
+ # create the pusher setting last_stream_ordering to the current maximum
+ # stream ordering, so it will process pushes from this point onwards.
+ last_stream_ordering = self.store.get_room_max_stream_ordering()
+
# we try to create the pusher just to validate the config: it
# will then get pulled out of the database,
# recreated, added and started: this means we have only one
@@ -124,16 +128,12 @@ class PusherPool:
ts=time_now_msec,
lang=lang,
data=data,
- last_stream_ordering=None,
+ last_stream_ordering=last_stream_ordering,
last_success=None,
failing_since=None,
)
)
- # create the pusher setting last_stream_ordering to the current maximum
- # stream ordering, so it will process pushes from this point onwards.
- last_stream_ordering = self.store.get_room_max_stream_ordering()
-
await self.store.add_pusher(
user_id=user_id,
access_token=access_token,