From 37e893499f54872903c365aacc86a9d3eb6b7619 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 4 Feb 2025 11:53:27 +0000
Subject: [PATCH] 1.124.0rc1

---
 CHANGES.md               | 27 +++++++++++++++++++++++++++
 changelog.d/18000.bugfix |  1 -
 changelog.d/18073.bugfix |  1 -
 changelog.d/18075.bugfix |  1 -
 changelog.d/18089.bugfix |  2 --
 changelog.d/18107.bugfix |  1 -
 changelog.d/18109.misc   |  1 -
 changelog.d/18112.bugfix |  1 -
 changelog.d/18119.bugfix |  1 -
 changelog.d/18130.bugfix |  1 -
 changelog.d/18131.bugfix |  1 -
 debian/changelog         |  6 ++++++
 pyproject.toml           |  2 +-
 13 files changed, 34 insertions(+), 12 deletions(-)
 delete mode 100644 changelog.d/18000.bugfix
 delete mode 100644 changelog.d/18073.bugfix
 delete mode 100644 changelog.d/18075.bugfix
 delete mode 100644 changelog.d/18089.bugfix
 delete mode 100644 changelog.d/18107.bugfix
 delete mode 100644 changelog.d/18109.misc
 delete mode 100644 changelog.d/18112.bugfix
 delete mode 100644 changelog.d/18119.bugfix
 delete mode 100644 changelog.d/18130.bugfix
 delete mode 100644 changelog.d/18131.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index cc6426751d..051ab130b2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,30 @@
+# Synapse 1.124.0rc1 (2025-02-04)
+
+### Bugfixes
+
+- Add rate limit `rc_presence.per_user`. This prevents load from excessive presence updates sent by clients via sync api. Also rate limit `/_matrix/client/v3/presence` as per the spec. Contributed by @rda0. ([\#18000](https://github.com/element-hq/synapse/issues/18000))
+- Deactivated users will no longer automatically accept an invite when `auto_accept_invites` is enabled. ([\#18073](https://github.com/element-hq/synapse/issues/18073))
+- Fix join being denied after being invited over federation. Also fixes other out-of-band membership transitions. ([\#18075](https://github.com/element-hq/synapse/issues/18075))
+- Updates contributed `docker-compose.yml` file to PostgreSQL v15, as v12 is no longer supported by Synapse.
+  Contributed by @maxkratz. ([\#18089](https://github.com/element-hq/synapse/issues/18089))
+- Fix rare edge case where state groups could be deleted while we are persisting new events that reference them. ([\#18107](https://github.com/element-hq/synapse/issues/18107), [\#18130](https://github.com/element-hq/synapse/issues/18130), [\#18131](https://github.com/element-hq/synapse/issues/18131))
+- Raise an error if someone is using an incorrect suffix in a config duration string. ([\#18112](https://github.com/element-hq/synapse/issues/18112))
+- Fix a bug where the [Delete Room Admin API](https://element-hq.github.io/synapse/latest/admin_api/rooms.html#version-2-new-version) would fail if the `block` parameter was set to `true` and a worker other than the main process was configured to handle background tasks. ([\#18119](https://github.com/element-hq/synapse/issues/18119))
+
+### Internal Changes
+
+- Increase the length of the generated `nonce` parameter when perfoming OIDC logins to comply with the TI-Messenger spec. ([\#18109](https://github.com/element-hq/synapse/issues/18109))
+
+
+
+### Updates to locked dependencies
+
+* Bump dawidd6/action-download-artifact from 7 to 8. ([\#18108](https://github.com/element-hq/synapse/issues/18108))
+* Bump log from 0.4.22 to 0.4.25. ([\#18098](https://github.com/element-hq/synapse/issues/18098))
+* Bump python-multipart from 0.0.18 to 0.0.20. ([\#18096](https://github.com/element-hq/synapse/issues/18096))
+* Bump serde_json from 1.0.135 to 1.0.137. ([\#18099](https://github.com/element-hq/synapse/issues/18099))
+* Bump types-bleach from 6.1.0.20240331 to 6.2.0.20241123. ([\#18082](https://github.com/element-hq/synapse/issues/18082))
+
 # Synapse 1.123.0 (2025-01-28)
 
 No significant changes since 1.123.0rc1.
diff --git a/changelog.d/18000.bugfix b/changelog.d/18000.bugfix
deleted file mode 100644
index a8f1545bf5..0000000000
--- a/changelog.d/18000.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add rate limit `rc_presence.per_user`. This prevents load from excessive presence updates sent by clients via sync api. Also rate limit `/_matrix/client/v3/presence` as per the spec. Contributed by @rda0.
diff --git a/changelog.d/18073.bugfix b/changelog.d/18073.bugfix
deleted file mode 100644
index eeb56a7a61..0000000000
--- a/changelog.d/18073.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Deactivated users will no longer automatically accept an invite when `auto_accept_invites` is enabled.
\ No newline at end of file
diff --git a/changelog.d/18075.bugfix b/changelog.d/18075.bugfix
deleted file mode 100644
index 95b486bed1..0000000000
--- a/changelog.d/18075.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix join being denied after being invited over federation. Also fixes other out-of-band membership transitions.
diff --git a/changelog.d/18089.bugfix b/changelog.d/18089.bugfix
deleted file mode 100644
index 607fab7112..0000000000
--- a/changelog.d/18089.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Updates contributed `docker-compose.yml` file to PostgreSQL v15, as v12 is no longer supported by Synapse.
-Contributed by @maxkratz.
\ No newline at end of file
diff --git a/changelog.d/18107.bugfix b/changelog.d/18107.bugfix
deleted file mode 100644
index 4d0c19fab9..0000000000
--- a/changelog.d/18107.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix rare edge case where state groups could be deleted while we are persisting new events that reference them.
diff --git a/changelog.d/18109.misc b/changelog.d/18109.misc
deleted file mode 100644
index c310e76f78..0000000000
--- a/changelog.d/18109.misc
+++ /dev/null
@@ -1 +0,0 @@
-Increase the length of the generated `nonce` parameter when perfoming OIDC logins to comply with the TI-Messenger spec.
\ No newline at end of file
diff --git a/changelog.d/18112.bugfix b/changelog.d/18112.bugfix
deleted file mode 100644
index 61c94280d8..0000000000
--- a/changelog.d/18112.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Raise an error if someone is using an incorrect suffix in a config duration string.
diff --git a/changelog.d/18119.bugfix b/changelog.d/18119.bugfix
deleted file mode 100644
index c8ac53f9d4..0000000000
--- a/changelog.d/18119.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where the [Delete Room Admin API](https://element-hq.github.io/synapse/latest/admin_api/rooms.html#version-2-new-version) would fail if the `block` parameter was set to `true` and a worker other than the main process was configured to handle background tasks.
\ No newline at end of file
diff --git a/changelog.d/18130.bugfix b/changelog.d/18130.bugfix
deleted file mode 100644
index 4d0c19fab9..0000000000
--- a/changelog.d/18130.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix rare edge case where state groups could be deleted while we are persisting new events that reference them.
diff --git a/changelog.d/18131.bugfix b/changelog.d/18131.bugfix
deleted file mode 100644
index 4d0c19fab9..0000000000
--- a/changelog.d/18131.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix rare edge case where state groups could be deleted while we are persisting new events that reference them.
diff --git a/debian/changelog b/debian/changelog
index a470dff676..0b6d50daaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.124.0~rc1) stable; urgency=medium
+
+  * New Synapse release 1.124.0rc1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 04 Feb 2025 11:53:05 +0000
+
 matrix-synapse-py3 (1.123.0) stable; urgency=medium
 
   * New Synapse release 1.123.0.
diff --git a/pyproject.toml b/pyproject.toml
index 1cd874716e..8febdc4c23 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -97,7 +97,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.123.0"
+version = "1.124.0rc1"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"
-- 
GitLab