diff options
| author | Erik Johnston <erik@matrix.org> | 2021-02-25 10:53:31 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-02-25 10:53:31 +0000 |
| commit | 1efdcc3e8724808996a7b60a60ca72c1b96fee0b (patch) | |
| tree | 0c4d80707391fc3e6a68abd7b3646f79fa5d2cb8 /synapse | |
| parent | Add support for X-Forwarded-Proto (#9472) (diff) | |
| parent | Fixup changelog (diff) | |
| download | synapse-1efdcc3e8724808996a7b60a60ca72c1b96fee0b.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/rest/synapse/client/__init__.py | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 2e70f46186..869e860fb0 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.28.0rc1" +__version__ = "1.28.0" 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/synapse/client/__init__.py b/synapse/rest/synapse/client/__init__.py index 8588b6d271..9eeb970580 100644 --- a/synapse/rest/synapse/client/__init__.py +++ b/synapse/rest/synapse/client/__init__.py @@ -54,7 +54,12 @@ def build_synapse_client_resource_tree(hs: "HomeServer") -> Mapping[str, Resourc if hs.config.saml2_enabled: from synapse.rest.synapse.client.saml2 import SAML2Resource - resources["/_synapse/client/saml2"] = SAML2Resource(hs) + res = SAML2Resource(hs) + resources["/_synapse/client/saml2"] = res + + # This is also mounted under '/_matrix' for backwards-compatibility. + # To be removed in Synapse v1.32.0. + resources["/_matrix/saml2"] = res return resources |