Merge branch 'master' into develop

Author: sandhose

CHANGES.md

@@ -1,3 +1,12 @@
+# Synapse 1.120.0 (2024-11-26)
+
+### Bugfixes
+
+- Fix a bug introduced in Synapse v1.120rc1 which would cause the newly-introduced `delete_old_otks` job to fail in worker-mode deployments. ([\#17960](https://github.com/element-hq/synapse/issues/17960))
+
+
+
+
 # Synapse 1.120.0rc1 (2024-11-20)
 
 This release enables the enforcement of authenticated media by default, with exemptions for media that is already present in the

debian/changelog

@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.120.0) stable; urgency=medium
+
+  * New synapse release 1.120.0.
+
+ -- Synapse Packaging team <[email protected]>  Tue, 26 Nov 2024 13:10:23 +0000
+
 matrix-synapse-py3 (1.120.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.120.0rc1.

pyproject.toml

@@ -97,7 +97,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.120.0rc1"
+version = "1.120.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <[email protected]>"]
 license = "AGPL-3.0-or-later"

synapse/server.py

@@ -254,6 +254,7 @@ class HomeServer(metaclass=abc.ABCMeta):
         "auth",
         "deactivate_account",
         "delayed_events",
+        "e2e_keys",  # for the `delete_old_otks` scheduled-task handler
         "message",
         "pagination",
         "profile",