1.21.0

2024-11-22 09:35:45 +03:00 · 2020-10-01 13:14:56 +01:00 · 2020-10-01 13:14:56 +01:00 · cc40a59b4a
commit cc40a59b4a
parent c1ef579b63
87 changed files with 103 additions and 87 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,3 +1,105 @@
 Synapse 1.21.0 (2020-10-01)
 ===========================
 Features
 --------
 - Require the user to confirm that their password should be reset after clicking the email confirmation link. ([\#8004](https://github.com/matrix-org/synapse/issues/8004))
 - Add an admin API `GET /_synapse/admin/v1/event_reports` to read entries of table `event_reports`. Contributed by @dklimpel. ([\#8217](https://github.com/matrix-org/synapse/issues/8217))
 - Consolidate the SSO error template across all configuration. ([\#8248](https://github.com/matrix-org/synapse/issues/8248), [\#8405](https://github.com/matrix-org/synapse/issues/8405))
 - Add a configuration option to specify a whitelist of domains that a user can be redirected to after validating their email or phone number. ([\#8275](https://github.com/matrix-org/synapse/issues/8275), [\#8417](https://github.com/matrix-org/synapse/issues/8417))
 - Add experimental support for sharding event persister. ([\#8294](https://github.com/matrix-org/synapse/issues/8294), [\#8387](https://github.com/matrix-org/synapse/issues/8387), [\#8396](https://github.com/matrix-org/synapse/issues/8396), [\#8419](https://github.com/matrix-org/synapse/issues/8419))
 - Add the room topic and avatar to the room details admin API. ([\#8305](https://github.com/matrix-org/synapse/issues/8305))
 - Add an admin API for querying rooms where a user is a member. Contributed by @dklimpel. ([\#8306](https://github.com/matrix-org/synapse/issues/8306))
 - Add `uk.half-shot.msc2778.login.application_service` login type to allow appservices to login. ([\#8320](https://github.com/matrix-org/synapse/issues/8320))
 - Add a configuration option that allows existing users to log in with OpenID Connect. Contributed by @BBBSnowball and @OmmyZhang. ([\#8345](https://github.com/matrix-org/synapse/issues/8345))
 - Add prometheus metrics for replication requests. ([\#8406](https://github.com/matrix-org/synapse/issues/8406))
 - Support passing additional single sign-on parameters to the client. ([\#8413](https://github.com/matrix-org/synapse/issues/8413))
 - Add experimental reporting of metrics on expensive rooms for state-resolution. ([\#8420](https://github.com/matrix-org/synapse/issues/8420))
 - Add experimental prometheus metric to track numbers of "large" rooms for state resolutiom. ([\#8425](https://github.com/matrix-org/synapse/issues/8425))
 - Add prometheus metrics to track federation delays. ([\#8430](https://github.com/matrix-org/synapse/issues/8430))
 Bugfixes
 --------
 - Fix a bug in the media repository where remote thumbnails with the same size but different crop methods would overwrite each other. Contributed by @deepbluev7. ([\#7124](https://github.com/matrix-org/synapse/issues/7124))
 - Fix inconsistent handling of non-existent push rules, and stop tracking the `enabled` state of removed push rules. ([\#7796](https://github.com/matrix-org/synapse/issues/7796))
 - Fix a longstanding bug when storing a media file with an empty `upload_name`. ([\#7905](https://github.com/matrix-org/synapse/issues/7905))
 - Fix messages not being sent over federation until an event is sent into the same room. ([\#8230](https://github.com/matrix-org/synapse/issues/8230), [\#8247](https://github.com/matrix-org/synapse/issues/8247), [\#8258](https://github.com/matrix-org/synapse/issues/8258), [\#8272](https://github.com/matrix-org/synapse/issues/8272), [\#8322](https://github.com/matrix-org/synapse/issues/8322))
 - Fix a longstanding bug where files that could not be thumbnailed would result in an Internal Server Error. ([\#8236](https://github.com/matrix-org/synapse/issues/8236))
 - Upgrade minimum version of `canonicaljson` to version 1.4.0, to fix an unicode encoding issue. ([\#8262](https://github.com/matrix-org/synapse/issues/8262))
 - Fix logstanding bug which could lead to incomplete database upgrades on SQLite. ([\#8265](https://github.com/matrix-org/synapse/issues/8265))
 - Fix stack overflow when stderr is redirected to the logging system, and the logging system encounters an error. ([\#8268](https://github.com/matrix-org/synapse/issues/8268))
 - Fix a bug which cause the logging system to report errors, if `DEBUG` was enabled and no `context` filter was applied. ([\#8278](https://github.com/matrix-org/synapse/issues/8278))
 - Fix edge case where push could get delayed for a user until a later event was pushed. ([\#8287](https://github.com/matrix-org/synapse/issues/8287))
 - Fix fetching malformed events from remote servers. ([\#8324](https://github.com/matrix-org/synapse/issues/8324))
 - Fix `UnboundLocalError` from occuring when appservices send a malformed register request. ([\#8329](https://github.com/matrix-org/synapse/issues/8329))
 - Don't send push notifications to expired user accounts. ([\#8353](https://github.com/matrix-org/synapse/issues/8353))
 - Fix a regression in v1.19.0 with reactivating users through the admin API. ([\#8362](https://github.com/matrix-org/synapse/issues/8362))
 - Fix a bug where during device registration the length of the device name wasn't limited. ([\#8364](https://github.com/matrix-org/synapse/issues/8364))
 - Include `guest_access` in the fields that are checked for null bytes when updating `room_stats_state`. Broke in v1.7.2. ([\#8373](https://github.com/matrix-org/synapse/issues/8373))
 - Fix theoretical race condition where events are not sent down `/sync` if the synchrotron worker is restarted without restarting other workers. ([\#8374](https://github.com/matrix-org/synapse/issues/8374))
 - Fix a bug which could cause errors in rooms with malformed membership events, on servers using sqlite. ([\#8385](https://github.com/matrix-org/synapse/issues/8385))
 - Fix a bug introduced in v1.20.0 which caused the `synapse_port_db` script to fail. ([\#8386](https://github.com/matrix-org/synapse/issues/8386))
 - Fix "Re-starting finished log context" warning when receiving an event we already had over federation. ([\#8398](https://github.com/matrix-org/synapse/issues/8398))
 - Fix incorrect handling of timeouts on outgoing HTTP requests. ([\#8400](https://github.com/matrix-org/synapse/issues/8400))
 - Fix a regression in v1.20.0 in the `synapse_port_db` script regarding the `ui_auth_sessions_ips` table. ([\#8410](https://github.com/matrix-org/synapse/issues/8410))
 - Remove unnecessary 3PID registration check when resetting password via an email address. Bug introduced in v0.34.0rc2. ([\#8414](https://github.com/matrix-org/synapse/issues/8414))
 Improved Documentation
 ----------------------
 - Add `/_synapse/client` to the reverse proxy documentation. ([\#8227](https://github.com/matrix-org/synapse/issues/8227))
 - Add note to the reverse proxy settings documentation about disabling Apache's mod_security2. Contributed by Julian Fietkau (@jfietkau). ([\#8375](https://github.com/matrix-org/synapse/issues/8375))
 - Improve description of `server_name` config option in `homserver.yaml`. ([\#8415](https://github.com/matrix-org/synapse/issues/8415))
 Deprecations and Removals
 -------------------------
 - Drop support for `prometheus_client` older than 0.4.0. ([\#8426](https://github.com/matrix-org/synapse/issues/8426))
 Internal Changes
 ----------------
 - Fix tests on distros which disable TLSv1.0. Contributed by @danc86. ([\#8208](https://github.com/matrix-org/synapse/issues/8208))
 - Simplify the distributor code to avoid unnecessary work. ([\#8216](https://github.com/matrix-org/synapse/issues/8216))
 - Remove the `populate_stats_process_rooms_2` background job and restore functionality to `populate_stats_process_rooms`. ([\#8243](https://github.com/matrix-org/synapse/issues/8243))
 - Clean up type hints for `PaginationConfig`. ([\#8250](https://github.com/matrix-org/synapse/issues/8250), [\#8282](https://github.com/matrix-org/synapse/issues/8282))
 - Track the latest event for every destination and room for catch-up after federation outage. ([\#8256](https://github.com/matrix-org/synapse/issues/8256))
 - Fix non-user visible bug in implementation of `MultiWriterIdGenerator.get_current_token_for_writer`. ([\#8257](https://github.com/matrix-org/synapse/issues/8257))
 - Switch to the JSON implementation from the standard library. ([\#8259](https://github.com/matrix-org/synapse/issues/8259))
 - Add type hints to `synapse.util.async_helpers`. ([\#8260](https://github.com/matrix-org/synapse/issues/8260))
 - Simplify tests that mock asynchronous functions. ([\#8261](https://github.com/matrix-org/synapse/issues/8261))
 - Add type hints to `StreamToken` and `RoomStreamToken` classes. ([\#8279](https://github.com/matrix-org/synapse/issues/8279))
 - Change `StreamToken.room_key` to be a `RoomStreamToken` instance. ([\#8281](https://github.com/matrix-org/synapse/issues/8281))
 - Refactor notifier code to correctly use the max event stream position. ([\#8288](https://github.com/matrix-org/synapse/issues/8288))
 - Use slotted classes where possible. ([\#8296](https://github.com/matrix-org/synapse/issues/8296))
 - Support testing the local Synapse checkout against the [Complement homeserver test suite](https://github.com/matrix-org/complement/). ([\#8317](https://github.com/matrix-org/synapse/issues/8317))
 - Update outdated usages of `metaclass` to python 3 syntax. ([\#8326](https://github.com/matrix-org/synapse/issues/8326))
 - Move lint-related dependencies to package-extra field, update CONTRIBUTING.md to utilise this. ([\#8330](https://github.com/matrix-org/synapse/issues/8330), [\#8377](https://github.com/matrix-org/synapse/issues/8377))
 - Use the `admin_patterns` helper in additional locations. ([\#8331](https://github.com/matrix-org/synapse/issues/8331))
 - Fix test logging to allow braces in log output. ([\#8335](https://github.com/matrix-org/synapse/issues/8335))
 - Remove `__future__` imports related to Python 2 compatibility. ([\#8337](https://github.com/matrix-org/synapse/issues/8337))
 - Simplify `super()` calls to Python 3 syntax. ([\#8344](https://github.com/matrix-org/synapse/issues/8344))
 - Fix bad merge from `release-v1.20.0` branch to `develop`. ([\#8354](https://github.com/matrix-org/synapse/issues/8354))
 - Factor out a `_send_dummy_event_for_room` method. ([\#8370](https://github.com/matrix-org/synapse/issues/8370))
 - Improve logging of state resolution. ([\#8371](https://github.com/matrix-org/synapse/issues/8371))
 - Add type annotations to `SimpleHttpClient`. ([\#8372](https://github.com/matrix-org/synapse/issues/8372))
 - Refactor ID generators to use `async with` syntax. ([\#8383](https://github.com/matrix-org/synapse/issues/8383))
 - Add `EventStreamPosition` type. ([\#8388](https://github.com/matrix-org/synapse/issues/8388))
 - Create a mechanism for marking tests "logcontext clean". ([\#8399](https://github.com/matrix-org/synapse/issues/8399))
 - A pair of tiny cleanups in the federation request code. ([\#8401](https://github.com/matrix-org/synapse/issues/8401))
 - Add checks on startup that PostgreSQL sequences are consistent with their associated tables. ([\#8402](https://github.com/matrix-org/synapse/issues/8402))
 - Do not include appservice users when calculating the total MAU for a server. ([\#8404](https://github.com/matrix-org/synapse/issues/8404))
 - Typing fixes for `synapse.handlers.federation`. ([\#8422](https://github.com/matrix-org/synapse/issues/8422))
 - Various refactors to simplify stream token handling. ([\#8423](https://github.com/matrix-org/synapse/issues/8423))
 - Make stream token serializing/deserializing async. ([\#8427](https://github.com/matrix-org/synapse/issues/8427))
 Synapse 1.20.1 (2020-09-24)
 ===========================
--- a/changelog.d/7124.bugfix
+++ b/changelog.d/7124.bugfix
@ -1 +0,0 @@
 Fix a bug in the media repository where remote thumbnails with the same size but different crop methods would overwrite each other. Contributed by @deepbluev7.
--- a/changelog.d/7796.bugfix
+++ b/changelog.d/7796.bugfix
@ -1 +0,0 @@
 Fix inconsistent handling of non-existent push rules, and stop tracking the `enabled` state of removed push rules.
--- a/changelog.d/7905.bugfix
+++ b/changelog.d/7905.bugfix
@ -1 +0,0 @@
 Fix a longstanding bug when storing a media file with an empty `upload_name`.
--- a/changelog.d/8004.feature
+++ b/changelog.d/8004.feature
@ -1 +0,0 @@
 Require the user to confirm that their password should be reset after clicking the email confirmation link.
--- a/changelog.d/8208.misc
+++ b/changelog.d/8208.misc
@ -1 +0,0 @@
 Fix tests on distros which disable TLSv1.0. Contributed by @danc86.
--- a/changelog.d/8216.misc
+++ b/changelog.d/8216.misc
@ -1 +0,0 @@
 Simplify the distributor code to avoid unnecessary work.
--- a/changelog.d/8217.feature
+++ b/changelog.d/8217.feature
@ -1 +0,0 @@
 Add an admin API `GET /_synapse/admin/v1/event_reports` to read entries of table `event_reports`. Contributed by @dklimpel.
--- a/changelog.d/8227.doc
+++ b/changelog.d/8227.doc
@ -1 +0,0 @@
 Add `/_synapse/client` to the reverse proxy documentation.
--- a/changelog.d/8230.bugfix
+++ b/changelog.d/8230.bugfix
@ -1 +0,0 @@
 Fix messages over federation being lost until an event is sent into the same room.
--- a/changelog.d/8236.bugfix
+++ b/changelog.d/8236.bugfix
@ -1 +0,0 @@
 Fix a longstanding bug where files that could not be thumbnailed would result in an Internal Server Error.
--- a/changelog.d/8243.misc
+++ b/changelog.d/8243.misc
@ -1 +0,0 @@
 Remove the 'populate_stats_process_rooms_2' background job and restore functionality to 'populate_stats_process_rooms'.
--- a/changelog.d/8247.bugfix
+++ b/changelog.d/8247.bugfix
@ -1 +0,0 @@
 Fix messages over federation being lost until an event is sent into the same room.
--- a/changelog.d/8248.feature
+++ b/changelog.d/8248.feature
@ -1 +0,0 @@
 Consolidate the SSO error template across all configuration.
--- a/changelog.d/8250.misc
+++ b/changelog.d/8250.misc
@ -1 +0,0 @@
 Clean up type hints for `PaginationConfig`.
--- a/changelog.d/8256.misc
+++ b/changelog.d/8256.misc
@ -1 +0,0 @@
 Track the latest event for every destination and room for catch-up after federation outage.
--- a/changelog.d/8257.misc
+++ b/changelog.d/8257.misc
@ -1 +0,0 @@
 Fix non-user visible bug in implementation of `MultiWriterIdGenerator.get_current_token_for_writer`.
--- a/changelog.d/8258.bugfix
+++ b/changelog.d/8258.bugfix
@ -1 +0,0 @@
 Fix messages over federation being lost until an event is sent into the same room.
--- a/changelog.d/8259.misc
+++ b/changelog.d/8259.misc
@ -1 +0,0 @@
 Switch to the JSON implementation from the standard library.
--- a/changelog.d/8260.misc
+++ b/changelog.d/8260.misc
@ -1 +0,0 @@
 Add type hints to `synapse.util.async_helpers`.
--- a/changelog.d/8261.misc
+++ b/changelog.d/8261.misc
@ -1 +0,0 @@
 Simplify tests that mock asynchronous functions.
--- a/changelog.d/8262.bugfix
+++ b/changelog.d/8262.bugfix
@ -1 +0,0 @@
 Upgrade canonicaljson to version 1.4.0 to fix an unicode encoding issue.
--- a/changelog.d/8265.bugfix
+++ b/changelog.d/8265.bugfix
@ -1 +0,0 @@
 Fix logstanding bug which could lead to incomplete database upgrades on SQLite.
--- a/changelog.d/8268.bugfix
+++ b/changelog.d/8268.bugfix
@ -1 +0,0 @@
 Fix stack overflow when stderr is redirected to the logging system, and the logging system encounters an error.
--- a/changelog.d/8272.bugfix
+++ b/changelog.d/8272.bugfix
@ -1 +0,0 @@
 Fix messages over federation being lost until an event is sent into the same room.
--- a/changelog.d/8275.feature
+++ b/changelog.d/8275.feature
@ -1 +0,0 @@
 Add a config option to specify a whitelist of domains that a user can be redirected to after validating their email or phone number.
--- a/changelog.d/8278.bugfix
+++ b/changelog.d/8278.bugfix
@ -1 +0,0 @@
 Fix a bug which cause the logging system to report errors, if `DEBUG` was enabled and no `context` filter was applied.
--- a/changelog.d/8279.misc
+++ b/changelog.d/8279.misc
@ -1 +0,0 @@
 Add type hints to `StreamToken` and `RoomStreamToken` classes.
--- a/changelog.d/8281.misc
+++ b/changelog.d/8281.misc
@ -1 +0,0 @@
 Change `StreamToken.room_key` to be a `RoomStreamToken` instance.
--- a/changelog.d/8282.misc
+++ b/changelog.d/8282.misc
@ -1 +0,0 @@
 Clean up type hints for `PaginationConfig`.
--- a/changelog.d/8287.bugfix
+++ b/changelog.d/8287.bugfix
@ -1 +0,0 @@
 Fix edge case where push could get delayed for a user until a later event was pushed.
--- a/changelog.d/8288.misc
+++ b/changelog.d/8288.misc
@ -1 +0,0 @@
 Refactor notifier code to correctly use the max event stream position.
--- a/changelog.d/8294.feature
+++ b/changelog.d/8294.feature
@ -1 +0,0 @@
 Add experimental support for sharding event persister.
--- a/changelog.d/8296.misc
+++ b/changelog.d/8296.misc
@ -1 +0,0 @@
 Use slotted classes where possible.
--- a/changelog.d/8305.feature
+++ b/changelog.d/8305.feature
@ -1 +0,0 @@
 Add the room topic and avatar to the room details admin API.
--- a/changelog.d/8306.feature
+++ b/changelog.d/8306.feature
@ -1 +0,0 @@
 Add an admin API for querying rooms where a user is a member. Contributed by @dklimpel.
--- a/changelog.d/8317.feature
+++ b/changelog.d/8317.feature
@ -1 +0,0 @@
 Support testing the local Synapse checkout against the [Complement homeserver test suite](https://github.com/matrix-org/complement/).
--- a/changelog.d/8320.feature
+++ b/changelog.d/8320.feature
@ -1 +0,0 @@
 Add `uk.half-shot.msc2778.login.application_service` login type to allow appservices to login.
--- a/changelog.d/8322.bugfix
+++ b/changelog.d/8322.bugfix
@ -1 +0,0 @@
 Fix messages over federation being lost until an event is sent into the same room.
--- a/changelog.d/8324.bugfix
+++ b/changelog.d/8324.bugfix
@ -1 +0,0 @@
 Fix fetching events from remote servers that are malformed.
--- a/changelog.d/8326.misc
+++ b/changelog.d/8326.misc
@ -1 +0,0 @@
 Update outdated usages of `metaclass` to python 3 syntax.
--- a/changelog.d/8329.bugfix
+++ b/changelog.d/8329.bugfix
@ -1 +0,0 @@
 Fix UnboundLocalError from occuring when appservices send malformed register request.
--- a/changelog.d/8330.misc
+++ b/changelog.d/8330.misc
@ -1 +0,0 @@
 Move lint-related dependencies to package-extra field, update CONTRIBUTING.md to utilise this.
--- a/changelog.d/8331.misc
+++ b/changelog.d/8331.misc
@ -1 +0,0 @@
 Use the `admin_patterns` helper in additional locations.
--- a/changelog.d/8335.misc
+++ b/changelog.d/8335.misc
@ -1 +0,0 @@
 Fix test logging to allow braces in log output.
--- a/changelog.d/8337.misc
+++ b/changelog.d/8337.misc
@ -1 +0,0 @@
 Remove `__future__` imports related to Python 2 compatibility.
--- a/changelog.d/8344.misc
+++ b/changelog.d/8344.misc
@ -1 +0,0 @@
 Simplify `super()` calls to Python 3 syntax.
--- a/changelog.d/8345.feature
+++ b/changelog.d/8345.feature
@ -1 +0,0 @@
 Add a configuration option that allows existing users to log in with OpenID Connect. Contributed by @BBBSnowball and @OmmyZhang.
--- a/changelog.d/8353.bugfix
+++ b/changelog.d/8353.bugfix
@ -1 +0,0 @@
 Don't send push notifications to expired user accounts.
--- a/changelog.d/8354.misc
+++ b/changelog.d/8354.misc
@ -1 +0,0 @@
 Fix bad merge from `release-v1.20.0` branch to `develop`.
--- a/changelog.d/8362.bugfix
+++ b/changelog.d/8362.bugfix
@ -1 +0,0 @@
 Fixed a regression in v1.19.0 with reactivating users through the admin API.
--- a/changelog.d/8364.bugfix
+++ b/changelog.d/8364.bugfix
@ -1,2 +0,0 @@
 Fix a bug where during device registration the length of the device name wasn't
 limited.
--- a/changelog.d/8370.misc
+++ b/changelog.d/8370.misc
@ -1 +0,0 @@
 Factor out a `_send_dummy_event_for_room` method.
--- a/changelog.d/8371.misc
+++ b/changelog.d/8371.misc
@ -1 +0,0 @@
 Improve logging of state resolution.
--- a/changelog.d/8372.misc
+++ b/changelog.d/8372.misc
@ -1 +0,0 @@
 Add type annotations to `SimpleHttpClient`.
--- a/changelog.d/8373.bugfix
+++ b/changelog.d/8373.bugfix
@ -1 +0,0 @@
 Include `guest_access` in the fields that are checked for null bytes when updating `room_stats_state`. Broke in v1.7.2.
--- a/changelog.d/8374.bugfix
+++ b/changelog.d/8374.bugfix
@ -1 +0,0 @@
 Fix theoretical race condition where events are not sent down `/sync` if the synchrotron worker is restarted without restarting other workers.
--- a/changelog.d/8375.doc
+++ b/changelog.d/8375.doc
@ -1 +0,0 @@
 Add note to the reverse proxy settings documentation about disabling Apache's mod_security2. Contributed by Julian Fietkau (@jfietkau).
--- a/changelog.d/8377.misc
+++ b/changelog.d/8377.misc
@ -1 +0,0 @@
 Move lint-related dependencies to package-extra field, update CONTRIBUTING.md to utilise this.
--- a/changelog.d/8383.misc
+++ b/changelog.d/8383.misc
@ -1 +0,0 @@
 Refactor ID generators to use `async with` syntax.
--- a/changelog.d/8385.bugfix
+++ b/changelog.d/8385.bugfix
@ -1 +0,0 @@
 Fix a bug which could cause errors in rooms with malformed membership events, on servers using sqlite.
--- a/changelog.d/8386.bugfix
+++ b/changelog.d/8386.bugfix
@ -1 +0,0 @@
 Fix a bug introduced in v1.20.0 which caused the `synapse_port_db` script to fail.
--- a/changelog.d/8387.feature
+++ b/changelog.d/8387.feature
@ -1 +0,0 @@
 Add experimental support for sharding event persister.
--- a/changelog.d/8388.misc
+++ b/changelog.d/8388.misc
@ -1 +0,0 @@
 Add `EventStreamPosition` type.
--- a/changelog.d/8396.feature
+++ b/changelog.d/8396.feature
@ -1 +0,0 @@
 Add experimental support for sharding event persister.
--- a/changelog.d/8398.bugfix
+++ b/changelog.d/8398.bugfix
@ -1 +0,0 @@
 Fix "Re-starting finished log context" warning when receiving an event we already had over federation.
--- a/changelog.d/8399.misc
+++ b/changelog.d/8399.misc
@ -1 +0,0 @@
 Create a mechanism for marking tests "logcontext clean".
--- a/changelog.d/8400.bugfix
+++ b/changelog.d/8400.bugfix
@ -1 +0,0 @@
 Fix incorrect handling of timeouts on outgoing HTTP requests.
--- a/changelog.d/8401.misc
+++ b/changelog.d/8401.misc
@ -1 +0,0 @@
 A pair of tiny cleanups in the federation request code.
--- a/changelog.d/8402.misc
+++ b/changelog.d/8402.misc
@ -1 +0,0 @@
 Add checks on startup that PostgreSQL sequences are consistent with their associated tables.
--- a/changelog.d/8404.misc
+++ b/changelog.d/8404.misc
@ -1 +0,0 @@
 Do not include appservice users when calculating the total MAU for a server.
--- a/changelog.d/8405.feature
+++ b/changelog.d/8405.feature
@ -1 +0,0 @@
 Consolidate the SSO error template across all configuration.
--- a/changelog.d/8406.feature
+++ b/changelog.d/8406.feature
@ -1 +0,0 @@
 Add prometheus metrics for replication requests.
--- a/changelog.d/8410.bugfix
+++ b/changelog.d/8410.bugfix
@ -1 +0,0 @@
 Fix a v1.20.0 regression in the `synapse_port_db` script regarding the `ui_auth_sessions_ips` table.
--- a/changelog.d/8413.feature
+++ b/changelog.d/8413.feature
@ -1 +0,0 @@
 Support passing additional single sign-on parameters to the client.
--- a/changelog.d/8414.bugfix
+++ b/changelog.d/8414.bugfix
@ -1 +0,0 @@
 Remove unnecessary 3PID registration check when resetting password via an email address. Bug introduced in v0.34.0rc2.
--- a/changelog.d/8415.doc
+++ b/changelog.d/8415.doc
@ -1 +0,0 @@
 Improve description of `server_name` config option in `homserver.yaml`.
--- a/changelog.d/8417.feature
+++ b/changelog.d/8417.feature
@ -1 +0,0 @@
 Add a config option to specify a whitelist of domains that a user can be redirected to after validating their email or phone number.
--- a/changelog.d/8419.feature
+++ b/changelog.d/8419.feature
@ -1 +0,0 @@
 Add experimental support for sharding event persister.
--- a/changelog.d/8420.feature
+++ b/changelog.d/8420.feature
@ -1 +0,0 @@
 Add experimental reporting of metrics on expensive rooms for state-resolution.
--- a/changelog.d/8422.misc
+++ b/changelog.d/8422.misc
@ -1 +0,0 @@
 Typing fixes for `synapse.handlers.federation`.
--- a/changelog.d/8423.misc
+++ b/changelog.d/8423.misc
@ -1 +0,0 @@
 Various refactors to simplify stream token handling.
--- a/changelog.d/8425.feature
+++ b/changelog.d/8425.feature
@ -1 +0,0 @@
 Add experimental prometheus metric to track numbers of "large" rooms for state resolutiom.
--- a/changelog.d/8426.removal
+++ b/changelog.d/8426.removal
@ -1 +0,0 @@
 Drop support for `prometheus_client` older than 0.4.0.
--- a/changelog.d/8427.misc
+++ b/changelog.d/8427.misc
@ -1 +0,0 @@
 Make stream token serializing/deserializing async.
--- a/changelog.d/8430.feature
+++ b/changelog.d/8430.feature
@ -1 +0,0 @@
 Add prometheus metrics to track federation delays.
--- a/synapse/init.py
+++ b/synapse/init.py
@ -48,7 +48,7 @@ try:
 except ImportError:
    pass
-__version__ = "1.20.1"
+__version__ = "1.21.0"
 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
		`@ -1 +0,0 @@`
			`Fix a bug in the media repository where remote thumbnails with the same size but different crop methods would overwrite each other. Contributed by @deepbluev7.`
		`@ -1 +0,0 @@`
			Fix inconsistent handling of non-existent push rules, and stop tracking the `enabled` state of removed push rules.
		`@ -1 +0,0 @@`
			Fix a longstanding bug when storing a media file with an empty `upload_name`.
		`@ -1 +0,0 @@`
			`Require the user to confirm that their password should be reset after clicking the email confirmation link.`
		`@ -1 +0,0 @@`
			`Fix tests on distros which disable TLSv1.0. Contributed by @danc86.`
		`@ -1 +0,0 @@`
			`Simplify the distributor code to avoid unnecessary work.`
		`@ -1 +0,0 @@`
			Add an admin API `GET /_synapse/admin/v1/event_reports` to read entries of table `event_reports`. Contributed by @dklimpel.
		`@ -1 +0,0 @@`
			Add `/_synapse/client` to the reverse proxy documentation.
		`@ -1 +0,0 @@`
			`Fix messages over federation being lost until an event is sent into the same room.`
		`@ -1 +0,0 @@`
			`Fix a longstanding bug where files that could not be thumbnailed would result in an Internal Server Error.`