From b8cf480fa951cbebfb180105d1f0ba6966cf051b Mon Sep 17 00:00:00 2001
From: Sean Quah <seanq@matrix.org>
Date: Tue, 13 Dec 2022 13:30:07 +0000
Subject: [PATCH 1/3] 1.74.0rc1

---
 CHANGES.md                | 79 +++++++++++++++++++++++++++++++++++++++
 changelog.d/14255.misc    |  1 -
 changelog.d/14435.bugfix  |  1 -
 changelog.d/14464.feature |  1 -
 changelog.d/14473.misc    |  1 -
 changelog.d/14474.misc    |  1 -
 changelog.d/14490.feature |  1 -
 changelog.d/14493.doc     |  1 -
 changelog.d/14517.doc     |  1 -
 changelog.d/14525.feature |  1 -
 changelog.d/14528.misc    |  1 -
 changelog.d/14548.misc    |  1 -
 changelog.d/14549.misc    |  1 -
 changelog.d/14551.feature |  1 -
 changelog.d/14568.misc    |  1 -
 changelog.d/14576.feature |  1 -
 changelog.d/14590.doc     |  1 -
 changelog.d/14591.misc    |  1 -
 changelog.d/14592.bugfix  |  1 -
 changelog.d/14594.doc     |  1 -
 changelog.d/14597.misc    |  1 -
 changelog.d/14598.feature |  1 -
 changelog.d/14600.bugfix  |  1 -
 changelog.d/14602.misc    |  1 -
 changelog.d/14604.bugfix  |  1 -
 changelog.d/14607.misc    |  1 -
 changelog.d/14610.misc    |  1 -
 changelog.d/14611.misc    |  1 -
 changelog.d/14612.misc    |  1 -
 changelog.d/14613.misc    |  1 -
 changelog.d/14614.misc    |  1 -
 changelog.d/14615.misc    |  1 -
 changelog.d/14616.misc    |  1 -
 changelog.d/14619.doc     |  1 -
 changelog.d/14620.bugfix  |  1 -
 changelog.d/14621.bugfix  |  1 -
 changelog.d/14625.bugfix  |  1 -
 changelog.d/14631.bugfix  |  1 -
 changelog.d/14632.bugfix  |  1 -
 changelog.d/14634.doc     |  1 -
 changelog.d/14636.misc    |  1 -
 changelog.d/14637.bugfix  |  1 -
 changelog.d/14639.bugfix  |  1 -
 changelog.d/14642.feature |  1 -
 changelog.d/14643.bugfix  |  1 -
 changelog.d/14645.misc    |  1 -
 changelog.d/14646.misc    |  1 -
 changelog.d/14650.bugfix  |  2 -
 changelog.d/14656.misc    |  1 -
 changelog.d/14657.misc    |  1 -
 changelog.d/14658.misc    |  1 -
 changelog.d/14659.misc    |  1 -
 changelog.d/14660.misc    |  1 -
 changelog.d/14661.misc    |  1 -
 changelog.d/14662.removal |  1 -
 changelog.d/14664.bugfix  |  1 -
 changelog.d/14668.misc    |  1 -
 changelog.d/14670.bugfix  |  1 -
 changelog.d/14671.misc    |  1 -
 debian/changelog          |  5 ++-
 pyproject.toml            |  2 +-
 61 files changed, 83 insertions(+), 62 deletions(-)
 delete mode 100644 changelog.d/14255.misc
 delete mode 100644 changelog.d/14435.bugfix
 delete mode 100644 changelog.d/14464.feature
 delete mode 100644 changelog.d/14473.misc
 delete mode 100644 changelog.d/14474.misc
 delete mode 100644 changelog.d/14490.feature
 delete mode 100644 changelog.d/14493.doc
 delete mode 100644 changelog.d/14517.doc
 delete mode 100644 changelog.d/14525.feature
 delete mode 100644 changelog.d/14528.misc
 delete mode 100644 changelog.d/14548.misc
 delete mode 100644 changelog.d/14549.misc
 delete mode 100644 changelog.d/14551.feature
 delete mode 100644 changelog.d/14568.misc
 delete mode 100644 changelog.d/14576.feature
 delete mode 100644 changelog.d/14590.doc
 delete mode 100644 changelog.d/14591.misc
 delete mode 100644 changelog.d/14592.bugfix
 delete mode 100644 changelog.d/14594.doc
 delete mode 100644 changelog.d/14597.misc
 delete mode 100644 changelog.d/14598.feature
 delete mode 100644 changelog.d/14600.bugfix
 delete mode 100644 changelog.d/14602.misc
 delete mode 100644 changelog.d/14604.bugfix
 delete mode 100644 changelog.d/14607.misc
 delete mode 100644 changelog.d/14610.misc
 delete mode 100644 changelog.d/14611.misc
 delete mode 100644 changelog.d/14612.misc
 delete mode 100644 changelog.d/14613.misc
 delete mode 100644 changelog.d/14614.misc
 delete mode 100644 changelog.d/14615.misc
 delete mode 100644 changelog.d/14616.misc
 delete mode 100644 changelog.d/14619.doc
 delete mode 100644 changelog.d/14620.bugfix
 delete mode 100644 changelog.d/14621.bugfix
 delete mode 100644 changelog.d/14625.bugfix
 delete mode 100644 changelog.d/14631.bugfix
 delete mode 100644 changelog.d/14632.bugfix
 delete mode 100644 changelog.d/14634.doc
 delete mode 100644 changelog.d/14636.misc
 delete mode 100644 changelog.d/14637.bugfix
 delete mode 100644 changelog.d/14639.bugfix
 delete mode 100644 changelog.d/14642.feature
 delete mode 100644 changelog.d/14643.bugfix
 delete mode 100644 changelog.d/14645.misc
 delete mode 100644 changelog.d/14646.misc
 delete mode 100644 changelog.d/14650.bugfix
 delete mode 100644 changelog.d/14656.misc
 delete mode 100644 changelog.d/14657.misc
 delete mode 100644 changelog.d/14658.misc
 delete mode 100644 changelog.d/14659.misc
 delete mode 100644 changelog.d/14660.misc
 delete mode 100644 changelog.d/14661.misc
 delete mode 100644 changelog.d/14662.removal
 delete mode 100644 changelog.d/14664.bugfix
 delete mode 100644 changelog.d/14668.misc
 delete mode 100644 changelog.d/14670.bugfix
 delete mode 100644 changelog.d/14671.misc

diff --git a/CHANGES.md b/CHANGES.md
index 8158d48f5..0df2e331d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,82 @@
+Synapse 1.74.0rc1 (2022-12-13)
+==============================
+
+Features
+--------
+
+- Improve user search for international display names. ([\#14464](https://github.com/matrix-org/synapse/issues/14464))
+- Stop using deprecated `keyIds` parameter when calling `/_matrix/key/v2/server`. ([\#14490](https://github.com/matrix-org/synapse/issues/14490), [\#14525](https://github.com/matrix-org/synapse/issues/14525))
+- Add new `push.enabled` config option to allow opting out of push notification calculation. ([\#14551](https://github.com/matrix-org/synapse/issues/14551))
+- Advertise support for Matrix 1.5 on `/_matrix/client/versions`. ([\#14576](https://github.com/matrix-org/synapse/issues/14576))
+- Improve opentracing and logging for to-device message handling. ([\#14598](https://github.com/matrix-org/synapse/issues/14598))
+- Allow selecting "prejoin" events by state keys in addition to event types. ([\#14642](https://github.com/matrix-org/synapse/issues/14642))
+
+
+Bugfixes
+--------
+
+- Fix a long-standing bug where a device list update might not be sent to clients in certain circumstances. ([\#14435](https://github.com/matrix-org/synapse/issues/14435), [\#14592](https://github.com/matrix-org/synapse/issues/14592), [\#14604](https://github.com/matrix-org/synapse/issues/14604))
+- Suppress a spurious warning when `POST /rooms/<room_id>/<membership>/`, `POST /join/<room_id_or_alias`, or the unspecced `PUT /join/<room_id_or_alias>/<txn_id>` receive an empty HTTP request body. ([\#14600](https://github.com/matrix-org/synapse/issues/14600))
+- Return spec-compliant JSON errors when unknown endpoints are requested. ([\#14620](https://github.com/matrix-org/synapse/issues/14620), [\#14621](https://github.com/matrix-org/synapse/issues/14621))
+- Fix html templates to load images only on HTTPS. Contributed by @ashfame. ([\#14625](https://github.com/matrix-org/synapse/issues/14625))
+- Fix a long-standing bug where the user directory would return 1 more row than requested. ([\#14631](https://github.com/matrix-org/synapse/issues/14631))
+- Reject invalid read receipt requests with empty room or event IDs. Contributed by Nick @ Beeper (@fizzadar). ([\#14632](https://github.com/matrix-org/synapse/issues/14632))
+- Fix a bug introduced in v1.67.0 where not specifying a config file or a server URL would lead to the `register_new_matrix_user` script failing. ([\#14637](https://github.com/matrix-org/synapse/issues/14637))
+- Fix a long-standing bug where the user directory and room/user stats might be out of sync. ([\#14639](https://github.com/matrix-org/synapse/issues/14639), [\#14643](https://github.com/matrix-org/synapse/issues/14643))
+- Fix a bug introduced in Synapse 1.72.0 where the background updates to add non-thread unique indexes on receipts would fail if they were previously interrupted. ([\#14650](https://github.com/matrix-org/synapse/issues/14650))
+- Improve validation of field size limits in events. ([\#14664](https://github.com/matrix-org/synapse/issues/14664))
+- Fix bugs introduced in 1.55.0 and 1.69.0 where application services would not be notified of events in the correct rooms, due to stale caches. ([\#14670](https://github.com/matrix-org/synapse/issues/14670))
+
+
+Improved Documentation
+----------------------
+
+- Update worker settings for `pusher` and `federation_sender` functionality. ([\#14493](https://github.com/matrix-org/synapse/issues/14493))
+- Add links to third party package repositories, and point to the bug which highlights Ubuntu's out-of-date packages. ([\#14517](https://github.com/matrix-org/synapse/issues/14517))
+- Remove old, incorrect minimum postgres version note and replace with a link to the [Dependency Deprecation Policy](https://matrix-org.github.io/synapse/v1.73/deprecation_policy.html). ([\#14590](https://github.com/matrix-org/synapse/issues/14590))
+- Add Single-Sign On setup instructions for Mastodon-based instances. ([\#14594](https://github.com/matrix-org/synapse/issues/14594))
+- Add new `push.enabled` config option to allow opting out of push notification calculation. ([\#14619](https://github.com/matrix-org/synapse/issues/14619))
+- Change `turn_allow_guests` example value to lowercase `true`. ([\#14634](https://github.com/matrix-org/synapse/issues/14634))
+
+
+Deprecations and Removals
+-------------------------
+
+- (remove from changelog: unreleased) Revert the deletion of stale devices due to performance issues. ([\#14662](https://github.com/matrix-org/synapse/issues/14662))
+
+
+Internal Changes
+----------------
+
+- Optimise push badge count calculations. Contributed by Nick @ Beeper (@fizzadar). ([\#14255](https://github.com/matrix-org/synapse/issues/14255))
+- Faster remote room joins: stream the un-partial-stating of rooms over replication. ([\#14473](https://github.com/matrix-org/synapse/issues/14473), [\#14474](https://github.com/matrix-org/synapse/issues/14474))
+- Share the `ClientRestResource` for both workers and the main process. ([\#14528](https://github.com/matrix-org/synapse/issues/14528))
+- Add `--editable` flag to `complement.sh` which uses an editable install of Synapse for faster turn-around times whilst developing iteratively. ([\#14548](https://github.com/matrix-org/synapse/issues/14548))
+- Faster joins: use servers list approximation to send read receipts when in partial state instead of waiting for the full state of the room. ([\#14549](https://github.com/matrix-org/synapse/issues/14549))
+- Modernize unit tests configuration related to workers. ([\#14568](https://github.com/matrix-org/synapse/issues/14568))
+- Bump jsonschema from 4.17.0 to 4.17.3. ([\#14591](https://github.com/matrix-org/synapse/issues/14591))
+- Add missing type hints. ([\#14597](https://github.com/matrix-org/synapse/issues/14597), [\#14646](https://github.com/matrix-org/synapse/issues/14646))
+- Fix Rust lint CI. ([\#14602](https://github.com/matrix-org/synapse/issues/14602))
+- Bump JasonEtco/create-an-issue from 2.5.0 to 2.8.1. ([\#14607](https://github.com/matrix-org/synapse/issues/14607))
+- Alter some unit test environment parameters to decrease time spent running tests. ([\#14610](https://github.com/matrix-org/synapse/issues/14610))
+- Switch to Go recommended installation method for `gotestfmt` template in CI. ([\#14611](https://github.com/matrix-org/synapse/issues/14611))
+- Bump phonenumbers from 8.13.0 to 8.13.1. ([\#14612](https://github.com/matrix-org/synapse/issues/14612))
+- Bump types-setuptools from 65.5.0.3 to 65.6.0.1. ([\#14613](https://github.com/matrix-org/synapse/issues/14613))
+- Bump twine from 4.0.1 to 4.0.2. ([\#14614](https://github.com/matrix-org/synapse/issues/14614))
+- Bump types-requests from 2.28.11.2 to 2.28.11.5. ([\#14615](https://github.com/matrix-org/synapse/issues/14615))
+- Bump cryptography from 38.0.3 to 38.0.4. ([\#14616](https://github.com/matrix-org/synapse/issues/14616))
+- Remove useless cargo install with apt from Dockerfile. ([\#14636](https://github.com/matrix-org/synapse/issues/14636))
+- Bump certifi from 2021.10.8 to 2022.12.7. ([\#14645](https://github.com/matrix-org/synapse/issues/14645))
+- Bump flake8-bugbear from 22.10.27 to 22.12.6. ([\#14656](https://github.com/matrix-org/synapse/issues/14656))
+- Bump packaging from 21.3 to 22.0. ([\#14657](https://github.com/matrix-org/synapse/issues/14657))
+- Bump types-pillow from 9.3.0.1 to 9.3.0.4. ([\#14658](https://github.com/matrix-org/synapse/issues/14658))
+- Bump serde from 1.0.148 to 1.0.150. ([\#14659](https://github.com/matrix-org/synapse/issues/14659))
+- Bump phonenumbers from 8.13.1 to 8.13.2. ([\#14660](https://github.com/matrix-org/synapse/issues/14660))
+- Bump authlib from 1.1.0 to 1.2.0. ([\#14661](https://github.com/matrix-org/synapse/issues/14661))
+- Move `StateFilter` to `synapse.types`. ([\#14668](https://github.com/matrix-org/synapse/issues/14668))
+- Improve type hints. ([\#14671](https://github.com/matrix-org/synapse/issues/14671))
+
+
 Synapse 1.73.0 (2022-12-06)
 ===========================
 
diff --git a/changelog.d/14255.misc b/changelog.d/14255.misc
deleted file mode 100644
index 39924659c..000000000
--- a/changelog.d/14255.misc
+++ /dev/null
@@ -1 +0,0 @@
-Optimise push badge count calculations. Contributed by Nick @ Beeper (@fizzadar).
diff --git a/changelog.d/14435.bugfix b/changelog.d/14435.bugfix
deleted file mode 100644
index 149ee99dd..000000000
--- a/changelog.d/14435.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where a device list update might not be sent to clients in certain circumstances.
diff --git a/changelog.d/14464.feature b/changelog.d/14464.feature
deleted file mode 100644
index 688ea3211..000000000
--- a/changelog.d/14464.feature
+++ /dev/null
@@ -1 +0,0 @@
-Improve user search for international display names.
diff --git a/changelog.d/14473.misc b/changelog.d/14473.misc
deleted file mode 100644
index deccd4e91..000000000
--- a/changelog.d/14473.misc
+++ /dev/null
@@ -1 +0,0 @@
-Faster remote room joins: stream the un-partial-stating of rooms over replication.
\ No newline at end of file
diff --git a/changelog.d/14474.misc b/changelog.d/14474.misc
deleted file mode 100644
index deccd4e91..000000000
--- a/changelog.d/14474.misc
+++ /dev/null
@@ -1 +0,0 @@
-Faster remote room joins: stream the un-partial-stating of rooms over replication.
\ No newline at end of file
diff --git a/changelog.d/14490.feature b/changelog.d/14490.feature
deleted file mode 100644
index c7cb57129..000000000
--- a/changelog.d/14490.feature
+++ /dev/null
@@ -1 +0,0 @@
-Stop using deprecated `keyIds` parameter when calling `/_matrix/key/v2/server`.
diff --git a/changelog.d/14493.doc b/changelog.d/14493.doc
deleted file mode 100644
index e26c68ffc..000000000
--- a/changelog.d/14493.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update worker settings for `pusher` and `federation_sender` functionality.
diff --git a/changelog.d/14517.doc b/changelog.d/14517.doc
deleted file mode 100644
index 2c9de6897..000000000
--- a/changelog.d/14517.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add links to third party package repositories, and point to the bug which highlights Ubuntu's out-of-date packages.
diff --git a/changelog.d/14525.feature b/changelog.d/14525.feature
deleted file mode 100644
index c7cb57129..000000000
--- a/changelog.d/14525.feature
+++ /dev/null
@@ -1 +0,0 @@
-Stop using deprecated `keyIds` parameter when calling `/_matrix/key/v2/server`.
diff --git a/changelog.d/14528.misc b/changelog.d/14528.misc
deleted file mode 100644
index 4f233feab..000000000
--- a/changelog.d/14528.misc
+++ /dev/null
@@ -1 +0,0 @@
-Share the `ClientRestResource` for both workers and the main process.
diff --git a/changelog.d/14548.misc b/changelog.d/14548.misc
deleted file mode 100644
index 416332015..000000000
--- a/changelog.d/14548.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add `--editable` flag to `complement.sh` which uses an editable install of Synapse for faster turn-around times whilst developing iteratively.
\ No newline at end of file
diff --git a/changelog.d/14549.misc b/changelog.d/14549.misc
deleted file mode 100644
index d9d863dd2..000000000
--- a/changelog.d/14549.misc
+++ /dev/null
@@ -1 +0,0 @@
-Faster joins: use servers list approximation to send read receipts when in partial state instead of waiting for the full state of the room.
\ No newline at end of file
diff --git a/changelog.d/14551.feature b/changelog.d/14551.feature
deleted file mode 100644
index 43b91d2e5..000000000
--- a/changelog.d/14551.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add new `push.enabled` config option to allow opting out of push notification calculation.
\ No newline at end of file
diff --git a/changelog.d/14568.misc b/changelog.d/14568.misc
deleted file mode 100644
index 99973de1c..000000000
--- a/changelog.d/14568.misc
+++ /dev/null
@@ -1 +0,0 @@
-Modernize unit tests configuration related to workers.
diff --git a/changelog.d/14576.feature b/changelog.d/14576.feature
deleted file mode 100644
index 4fe8cb266..000000000
--- a/changelog.d/14576.feature
+++ /dev/null
@@ -1 +0,0 @@
-Advertise support for Matrix 1.5 on `/_matrix/client/versions`.
diff --git a/changelog.d/14590.doc b/changelog.d/14590.doc
deleted file mode 100644
index 4196ffa95..000000000
--- a/changelog.d/14590.doc
+++ /dev/null
@@ -1 +0,0 @@
-Remove old, incorrect minimum postgres version note and replace with a link to the [Dependency Deprecation Policy](https://matrix-org.github.io/synapse/v1.73/deprecation_policy.html).
\ No newline at end of file
diff --git a/changelog.d/14591.misc b/changelog.d/14591.misc
deleted file mode 100644
index 053d868ba..000000000
--- a/changelog.d/14591.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump jsonschema from 4.17.0 to 4.17.3.
diff --git a/changelog.d/14592.bugfix b/changelog.d/14592.bugfix
deleted file mode 100644
index 149ee99dd..000000000
--- a/changelog.d/14592.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where a device list update might not be sent to clients in certain circumstances.
diff --git a/changelog.d/14594.doc b/changelog.d/14594.doc
deleted file mode 100644
index ee45a3812..000000000
--- a/changelog.d/14594.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add Single-Sign On setup instructions for Mastodon-based instances.
diff --git a/changelog.d/14597.misc b/changelog.d/14597.misc
deleted file mode 100644
index d44571b73..000000000
--- a/changelog.d/14597.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add missing type hints.
diff --git a/changelog.d/14598.feature b/changelog.d/14598.feature
deleted file mode 100644
index 88d561e28..000000000
--- a/changelog.d/14598.feature
+++ /dev/null
@@ -1 +0,0 @@
-Improve opentracing and logging for to-device message handling.
\ No newline at end of file
diff --git a/changelog.d/14600.bugfix b/changelog.d/14600.bugfix
deleted file mode 100644
index c4bf40568..000000000
--- a/changelog.d/14600.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Suppress a spurious warning when `POST /rooms/<room_id>/<membership>/`, `POST /join/<room_id_or_alias`, or the unspecced `PUT /join/<room_id_or_alias>/<txn_id>` receive an empty HTTP request body.
diff --git a/changelog.d/14602.misc b/changelog.d/14602.misc
deleted file mode 100644
index 092ba609d..000000000
--- a/changelog.d/14602.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix Rust lint CI.
diff --git a/changelog.d/14604.bugfix b/changelog.d/14604.bugfix
deleted file mode 100644
index 149ee99dd..000000000
--- a/changelog.d/14604.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where a device list update might not be sent to clients in certain circumstances.
diff --git a/changelog.d/14607.misc b/changelog.d/14607.misc
deleted file mode 100644
index e255eee31..000000000
--- a/changelog.d/14607.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump JasonEtco/create-an-issue from 2.5.0 to 2.8.1.
diff --git a/changelog.d/14610.misc b/changelog.d/14610.misc
deleted file mode 100644
index 097bf41ac..000000000
--- a/changelog.d/14610.misc
+++ /dev/null
@@ -1 +0,0 @@
-Alter some unit test environment parameters to decrease time spent running tests.
diff --git a/changelog.d/14611.misc b/changelog.d/14611.misc
deleted file mode 100644
index e4959d00f..000000000
--- a/changelog.d/14611.misc
+++ /dev/null
@@ -1 +0,0 @@
-Switch to Go recommended installation method for `gotestfmt` template in CI.
diff --git a/changelog.d/14612.misc b/changelog.d/14612.misc
deleted file mode 100644
index 74dae5684..000000000
--- a/changelog.d/14612.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump phonenumbers from 8.13.0 to 8.13.1.
diff --git a/changelog.d/14613.misc b/changelog.d/14613.misc
deleted file mode 100644
index c71923181..000000000
--- a/changelog.d/14613.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump types-setuptools from 65.5.0.3 to 65.6.0.1.
diff --git a/changelog.d/14614.misc b/changelog.d/14614.misc
deleted file mode 100644
index 189dd156e..000000000
--- a/changelog.d/14614.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump twine from 4.0.1 to 4.0.2.
diff --git a/changelog.d/14615.misc b/changelog.d/14615.misc
deleted file mode 100644
index 9d400a610..000000000
--- a/changelog.d/14615.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump types-requests from 2.28.11.2 to 2.28.11.5.
diff --git a/changelog.d/14616.misc b/changelog.d/14616.misc
deleted file mode 100644
index a2a57a194..000000000
--- a/changelog.d/14616.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump cryptography from 38.0.3 to 38.0.4.
diff --git a/changelog.d/14619.doc b/changelog.d/14619.doc
deleted file mode 100644
index f25e5494c..000000000
--- a/changelog.d/14619.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add new `push.enabled` config option to allow opting out of push notification calculation.
diff --git a/changelog.d/14620.bugfix b/changelog.d/14620.bugfix
deleted file mode 100644
index cb95a87d9..000000000
--- a/changelog.d/14620.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Return spec-compliant JSON errors when unknown endpoints are requested.
diff --git a/changelog.d/14621.bugfix b/changelog.d/14621.bugfix
deleted file mode 100644
index cb95a87d9..000000000
--- a/changelog.d/14621.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Return spec-compliant JSON errors when unknown endpoints are requested.
diff --git a/changelog.d/14625.bugfix b/changelog.d/14625.bugfix
deleted file mode 100644
index a4d121669..000000000
--- a/changelog.d/14625.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix html templates to load images only on HTTPS. Contributed by @ashfame.
diff --git a/changelog.d/14631.bugfix b/changelog.d/14631.bugfix
deleted file mode 100644
index c5376bab9..000000000
--- a/changelog.d/14631.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where the user directory would return 1 more row than requested.
\ No newline at end of file
diff --git a/changelog.d/14632.bugfix b/changelog.d/14632.bugfix
deleted file mode 100644
index 323d10f1b..000000000
--- a/changelog.d/14632.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Reject invalid read receipt requests with empty room or event IDs. Contributed by Nick @ Beeper (@fizzadar).
diff --git a/changelog.d/14634.doc b/changelog.d/14634.doc
deleted file mode 100644
index c21423627..000000000
--- a/changelog.d/14634.doc
+++ /dev/null
@@ -1 +0,0 @@
-Change `turn_allow_guests` example value to lowercase `true`.
diff --git a/changelog.d/14636.misc b/changelog.d/14636.misc
deleted file mode 100644
index 9d24f6888..000000000
--- a/changelog.d/14636.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove useless cargo install with apt from Dockerfile.
diff --git a/changelog.d/14637.bugfix b/changelog.d/14637.bugfix
deleted file mode 100644
index ab6db383c..000000000
--- a/changelog.d/14637.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in v1.67.0 where not specifying a config file or a server URL would lead to the `register_new_matrix_user` script failing.
\ No newline at end of file
diff --git a/changelog.d/14639.bugfix b/changelog.d/14639.bugfix
deleted file mode 100644
index 8730b10af..000000000
--- a/changelog.d/14639.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where the user directory and room/user stats might be out of sync.
diff --git a/changelog.d/14642.feature b/changelog.d/14642.feature
deleted file mode 100644
index cbc9db10c..000000000
--- a/changelog.d/14642.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow selecting "prejoin" events by state keys in addition to event types.
diff --git a/changelog.d/14643.bugfix b/changelog.d/14643.bugfix
deleted file mode 100644
index 8730b10af..000000000
--- a/changelog.d/14643.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where the user directory and room/user stats might be out of sync.
diff --git a/changelog.d/14645.misc b/changelog.d/14645.misc
deleted file mode 100644
index 012a57a40..000000000
--- a/changelog.d/14645.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump certifi from 2021.10.8 to 2022.12.7.
diff --git a/changelog.d/14646.misc b/changelog.d/14646.misc
deleted file mode 100644
index d44571b73..000000000
--- a/changelog.d/14646.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add missing type hints.
diff --git a/changelog.d/14650.bugfix b/changelog.d/14650.bugfix
deleted file mode 100644
index 5e18641bf..000000000
--- a/changelog.d/14650.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix a bug introduced in Synapse 1.72.0 where the background updates to add non-thread unique indexes on receipts would fail if they were previously interrupted.
-
diff --git a/changelog.d/14656.misc b/changelog.d/14656.misc
deleted file mode 100644
index 9725bb618..000000000
--- a/changelog.d/14656.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump flake8-bugbear from 22.10.27 to 22.12.6.
diff --git a/changelog.d/14657.misc b/changelog.d/14657.misc
deleted file mode 100644
index 3964488f8..000000000
--- a/changelog.d/14657.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump packaging from 21.3 to 22.0.
diff --git a/changelog.d/14658.misc b/changelog.d/14658.misc
deleted file mode 100644
index 9dc62a8ce..000000000
--- a/changelog.d/14658.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump types-pillow from 9.3.0.1 to 9.3.0.4.
diff --git a/changelog.d/14659.misc b/changelog.d/14659.misc
deleted file mode 100644
index 70cf6c9c4..000000000
--- a/changelog.d/14659.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump serde from 1.0.148 to 1.0.150.
diff --git a/changelog.d/14660.misc b/changelog.d/14660.misc
deleted file mode 100644
index 541f98bd9..000000000
--- a/changelog.d/14660.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump phonenumbers from 8.13.1 to 8.13.2.
diff --git a/changelog.d/14661.misc b/changelog.d/14661.misc
deleted file mode 100644
index 25d3b6fe6..000000000
--- a/changelog.d/14661.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump authlib from 1.1.0 to 1.2.0.
diff --git a/changelog.d/14662.removal b/changelog.d/14662.removal
deleted file mode 100644
index 19a387bbb..000000000
--- a/changelog.d/14662.removal
+++ /dev/null
@@ -1 +0,0 @@
-(remove from changelog: unreleased) Revert the deletion of stale devices due to performance issues.
\ No newline at end of file
diff --git a/changelog.d/14664.bugfix b/changelog.d/14664.bugfix
deleted file mode 100644
index a15df9a89..000000000
--- a/changelog.d/14664.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Improve validation of field size limits in events.
\ No newline at end of file
diff --git a/changelog.d/14668.misc b/changelog.d/14668.misc
deleted file mode 100644
index 5269d8a97..000000000
--- a/changelog.d/14668.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move `StateFilter` to `synapse.types`.
diff --git a/changelog.d/14670.bugfix b/changelog.d/14670.bugfix
deleted file mode 100644
index 98398d76c..000000000
--- a/changelog.d/14670.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bugs introduced in 1.55.0 and 1.69.0 where application services would not be notified of events in the correct rooms, due to stale caches.
diff --git a/changelog.d/14671.misc b/changelog.d/14671.misc
deleted file mode 100644
index 93ceaeafc..000000000
--- a/changelog.d/14671.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve type hints.
diff --git a/debian/changelog b/debian/changelog
index 5d3c4f7d6..64a950aff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-matrix-synapse-py3 (1.74.0~rc1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.74.0~rc1) stable; urgency=medium
 
   * New dependency on libicu-dev to provide improved results for user
     search.
+  * New Synapse release 1.74.0rc1.
 
- -- Synapse Packaging team <packages@matrix.org>  Tue, 06 Dec 2022 15:28:10 +0000
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 13 Dec 2022 13:30:01 +0000
 
 matrix-synapse-py3 (1.73.0) stable; urgency=medium
 
diff --git a/pyproject.toml b/pyproject.toml
index bb383683c..938aae64c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -57,7 +57,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.73.0"
+version = "1.74.0rc1"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"

From 822646b6361ad345a074ad66a125e6e327dd7862 Mon Sep 17 00:00:00 2001
From: Sean Quah <seanq@matrix.org>
Date: Tue, 13 Dec 2022 13:41:14 +0000
Subject: [PATCH 2/3] Tidy up CHANGES.md

---
 CHANGES.md | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 0df2e331d..0904cd9d6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,7 +6,7 @@ Features
 
 - Improve user search for international display names. ([\#14464](https://github.com/matrix-org/synapse/issues/14464))
 - Stop using deprecated `keyIds` parameter when calling `/_matrix/key/v2/server`. ([\#14490](https://github.com/matrix-org/synapse/issues/14490), [\#14525](https://github.com/matrix-org/synapse/issues/14525))
-- Add new `push.enabled` config option to allow opting out of push notification calculation. ([\#14551](https://github.com/matrix-org/synapse/issues/14551))
+- Add new `push.enabled` config option to allow opting out of push notification calculation. ([\#14551](https://github.com/matrix-org/synapse/issues/14551), [\#14619](https://github.com/matrix-org/synapse/issues/14619))
 - Advertise support for Matrix 1.5 on `/_matrix/client/versions`. ([\#14576](https://github.com/matrix-org/synapse/issues/14576))
 - Improve opentracing and logging for to-device message handling. ([\#14598](https://github.com/matrix-org/synapse/issues/14598))
 - Allow selecting "prejoin" events by state keys in addition to event types. ([\#14642](https://github.com/matrix-org/synapse/issues/14642))
@@ -18,7 +18,7 @@ Bugfixes
 - Fix a long-standing bug where a device list update might not be sent to clients in certain circumstances. ([\#14435](https://github.com/matrix-org/synapse/issues/14435), [\#14592](https://github.com/matrix-org/synapse/issues/14592), [\#14604](https://github.com/matrix-org/synapse/issues/14604))
 - Suppress a spurious warning when `POST /rooms/<room_id>/<membership>/`, `POST /join/<room_id_or_alias`, or the unspecced `PUT /join/<room_id_or_alias>/<txn_id>` receive an empty HTTP request body. ([\#14600](https://github.com/matrix-org/synapse/issues/14600))
 - Return spec-compliant JSON errors when unknown endpoints are requested. ([\#14620](https://github.com/matrix-org/synapse/issues/14620), [\#14621](https://github.com/matrix-org/synapse/issues/14621))
-- Fix html templates to load images only on HTTPS. Contributed by @ashfame. ([\#14625](https://github.com/matrix-org/synapse/issues/14625))
+- Update html templates to load images over HTTPS. Contributed by @ashfame. ([\#14625](https://github.com/matrix-org/synapse/issues/14625))
 - Fix a long-standing bug where the user directory would return 1 more row than requested. ([\#14631](https://github.com/matrix-org/synapse/issues/14631))
 - Reject invalid read receipt requests with empty room or event IDs. Contributed by Nick @ Beeper (@fizzadar). ([\#14632](https://github.com/matrix-org/synapse/issues/14632))
 - Fix a bug introduced in v1.67.0 where not specifying a config file or a server URL would lead to the `register_new_matrix_user` script failing. ([\#14637](https://github.com/matrix-org/synapse/issues/14637))
@@ -35,16 +35,9 @@ Improved Documentation
 - Add links to third party package repositories, and point to the bug which highlights Ubuntu's out-of-date packages. ([\#14517](https://github.com/matrix-org/synapse/issues/14517))
 - Remove old, incorrect minimum postgres version note and replace with a link to the [Dependency Deprecation Policy](https://matrix-org.github.io/synapse/v1.73/deprecation_policy.html). ([\#14590](https://github.com/matrix-org/synapse/issues/14590))
 - Add Single-Sign On setup instructions for Mastodon-based instances. ([\#14594](https://github.com/matrix-org/synapse/issues/14594))
-- Add new `push.enabled` config option to allow opting out of push notification calculation. ([\#14619](https://github.com/matrix-org/synapse/issues/14619))
 - Change `turn_allow_guests` example value to lowercase `true`. ([\#14634](https://github.com/matrix-org/synapse/issues/14634))
 
 
-Deprecations and Removals
--------------------------
-
-- (remove from changelog: unreleased) Revert the deletion of stale devices due to performance issues. ([\#14662](https://github.com/matrix-org/synapse/issues/14662))
-
-
 Internal Changes
 ----------------
 
@@ -55,7 +48,6 @@ Internal Changes
 - Faster joins: use servers list approximation to send read receipts when in partial state instead of waiting for the full state of the room. ([\#14549](https://github.com/matrix-org/synapse/issues/14549))
 - Modernize unit tests configuration related to workers. ([\#14568](https://github.com/matrix-org/synapse/issues/14568))
 - Bump jsonschema from 4.17.0 to 4.17.3. ([\#14591](https://github.com/matrix-org/synapse/issues/14591))
-- Add missing type hints. ([\#14597](https://github.com/matrix-org/synapse/issues/14597), [\#14646](https://github.com/matrix-org/synapse/issues/14646))
 - Fix Rust lint CI. ([\#14602](https://github.com/matrix-org/synapse/issues/14602))
 - Bump JasonEtco/create-an-issue from 2.5.0 to 2.8.1. ([\#14607](https://github.com/matrix-org/synapse/issues/14607))
 - Alter some unit test environment parameters to decrease time spent running tests. ([\#14610](https://github.com/matrix-org/synapse/issues/14610))
@@ -74,7 +66,7 @@ Internal Changes
 - Bump phonenumbers from 8.13.1 to 8.13.2. ([\#14660](https://github.com/matrix-org/synapse/issues/14660))
 - Bump authlib from 1.1.0 to 1.2.0. ([\#14661](https://github.com/matrix-org/synapse/issues/14661))
 - Move `StateFilter` to `synapse.types`. ([\#14668](https://github.com/matrix-org/synapse/issues/14668))
-- Improve type hints. ([\#14671](https://github.com/matrix-org/synapse/issues/14671))
+- Improve type hints. ([\#14597](https://github.com/matrix-org/synapse/issues/14597), [\#14646](https://github.com/matrix-org/synapse/issues/14646), [\#14671](https://github.com/matrix-org/synapse/issues/14671))
 
 
 Synapse 1.73.0 (2022-12-06)

From e70f398f4aee6980a461c1f32f65250f9f41e4c8 Mon Sep 17 00:00:00 2001
From: Sean Quah <seanq@matrix.org>
Date: Tue, 13 Dec 2022 13:44:19 +0000
Subject: [PATCH 3/3] Tidy up CHANGES.md

---
 CHANGES.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 0904cd9d6..b286ebdaf 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,11 +21,11 @@ Bugfixes
 - Update html templates to load images over HTTPS. Contributed by @ashfame. ([\#14625](https://github.com/matrix-org/synapse/issues/14625))
 - Fix a long-standing bug where the user directory would return 1 more row than requested. ([\#14631](https://github.com/matrix-org/synapse/issues/14631))
 - Reject invalid read receipt requests with empty room or event IDs. Contributed by Nick @ Beeper (@fizzadar). ([\#14632](https://github.com/matrix-org/synapse/issues/14632))
-- Fix a bug introduced in v1.67.0 where not specifying a config file or a server URL would lead to the `register_new_matrix_user` script failing. ([\#14637](https://github.com/matrix-org/synapse/issues/14637))
+- Fix a bug introduced in Synapse 1.67.0 where not specifying a config file or a server URL would lead to the `register_new_matrix_user` script failing. ([\#14637](https://github.com/matrix-org/synapse/issues/14637))
 - Fix a long-standing bug where the user directory and room/user stats might be out of sync. ([\#14639](https://github.com/matrix-org/synapse/issues/14639), [\#14643](https://github.com/matrix-org/synapse/issues/14643))
 - Fix a bug introduced in Synapse 1.72.0 where the background updates to add non-thread unique indexes on receipts would fail if they were previously interrupted. ([\#14650](https://github.com/matrix-org/synapse/issues/14650))
 - Improve validation of field size limits in events. ([\#14664](https://github.com/matrix-org/synapse/issues/14664))
-- Fix bugs introduced in 1.55.0 and 1.69.0 where application services would not be notified of events in the correct rooms, due to stale caches. ([\#14670](https://github.com/matrix-org/synapse/issues/14670))
+- Fix bugs introduced in Synapse 1.55.0 and 1.69.0 where application services would not be notified of events in the correct rooms, due to stale caches. ([\#14670](https://github.com/matrix-org/synapse/issues/14670))
 
 
 Improved Documentation