diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-01-20 12:33:05 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-01-20 12:33:05 +0000 |
| commit | 6c0dfd2e8e89d841587f3b601e2eaf8a358eb98e (patch) | |
| tree | c0e82ece8dd47bdd3d0d142953d8b494c0b40023 /synapse/config/saml2_config.py | |
| parent | Reword confusing sentence in CHANGES. (diff) | |
| parent | Give `public_baseurl` a default value (#9159) (diff) | |
| download | synapse-6c0dfd2e8e89d841587f3b601e2eaf8a358eb98e.tar.xz | |
Merge remote-tracking branch 'origin/develop' into release-v1.26.0
Diffstat (limited to 'synapse/config/saml2_config.py')
| -rw-r--r-- | synapse/config/saml2_config.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/config/saml2_config.py b/synapse/config/saml2_config.py index 7b97d4f114..f33dfa0d6a 100644 --- a/synapse/config/saml2_config.py +++ b/synapse/config/saml2_config.py @@ -189,8 +189,6 @@ class SAML2Config(Config): import saml2 public_baseurl = self.public_baseurl - if public_baseurl is None: - raise ConfigError("saml2_config requires a public_baseurl to be set") if self.saml2_grandfathered_mxid_source_attribute: optional_attributes.add(self.saml2_grandfathered_mxid_source_attribute) |