diff options
| author | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2022-01-07 14:22:13 +0000 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2022-01-07 14:22:13 +0000 |
| commit | 6a04767439ec15123c1aa7cac614155652d71c6a (patch) | |
| tree | fc35840da859551bbf8500e6ce5b52ddcf4476a8 /synapse | |
| parent | Bundle aggregations outside of the serialization method. (#11612) (diff) | |
| parent | Move changelog entry for drop of support to 'Deprecations and Removals' (diff) | |
| download | synapse-6a04767439ec15123c1aa7cac614155652d71c6a.tar.xz | |
Merge branch 'release-v1.50' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/rest/client/capabilities.py | 3 | ||||
| -rw-r--r-- | synapse/util/__init__.py | 7 |
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__) |