diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2020-12-04 09:14:31 -0500 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2020-12-04 09:14:31 -0500 |
| commit | 112f6bd49e54732e88523533f3b2d4b271be54e1 (patch) | |
| tree | 991e1ed53538e25486ed855c299d3599c380e895 /synapse/handlers/oidc_handler.py | |
| parent | Fix a buglet in the SAML username mapping provider doc (#8873) (diff) | |
| parent | Minor update to CHANGES. (diff) | |
| download | synapse-112f6bd49e54732e88523533f3b2d4b271be54e1.tar.xz | |
Merge tag 'v1.24.0rc2' into develop
Synapse 1.24.0rc2 (2020-12-04) ============================== Bugfixes -------- - Fix a regression in v1.24.0rc1 which failed to allow SAML mapping providers which were unable to redirect users to an additional page. ([\#8878](https://github.com/matrix-org/synapse/issues/8878)) Internal Changes ---------------- - Add support for the `prometheus_client` newer than 0.9.0. Contributed by Jordan Bancino. ([\#8875](https://github.com/matrix-org/synapse/issues/8875))
Diffstat (limited to 'synapse/handlers/oidc_handler.py')
| -rw-r--r-- | synapse/handlers/oidc_handler.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/oidc_handler.py b/synapse/handlers/oidc_handler.py index 55c4377890..c605f7082a 100644 --- a/synapse/handlers/oidc_handler.py +++ b/synapse/handlers/oidc_handler.py @@ -888,7 +888,7 @@ class OidcHandler(BaseHandler): # continue to already be in use. Note that the error raised is # arbitrary and will get turned into a MappingException. if failures: - raise RuntimeError( + raise MappingException( "Mapping provider does not support de-duplicating Matrix IDs" ) |