Merge branch 'release-v1.50' into develop

3 files changed, 11 insertions, 1 deletions

diff --git a/synapse/__init__.py b/synapse/__init__.py

index 95a49c20be..92aec334e6 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.49.2"
+__version__ = "1.50.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/rest/client/capabilities.py b/synapse/rest/client/capabilities.py

index 2a3e24ae7e..5c0e3a5680 100644
--- a/synapse/rest/client/capabilities.py
+++ b/synapse/rest/client/capabilities.py
@@ -73,6 +73,9 @@ class CapabilitiesRestServlet(RestServlet):
                 "enabled": self.config.registration.enable_3pid_changes
             }
 
+        if self.config.experimental.msc3440_enabled:
+            response["capabilities"]["io.element.thread"] = {"enabled": True}
+
         return 200, response
 
 
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py

index f157132210..511f52534b 100644
--- a/synapse/util/__init__.py
+++ b/synapse/util/__init__.py
@@ -31,6 +31,13 @@ from synapse.logging import context
 if typing.TYPE_CHECKING:
     pass
 
+# FIXME Mjolnir imports glob_to_regex from this file, but it was moved to
+#       matrix_common.
+#       As a temporary workaround, we import glob_to_regex here for
+#       compatibility with current versions of Mjolnir.
+# See https://github.com/matrix-org/mjolnir/pull/174
+from matrix_common.regex import glob_to_regex  # noqa
+
 logger = logging.getLogger(__name__)