summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-01-20 12:33:05 +0000
committerRichard van der Hoff <richard@matrix.org>2021-01-20 12:33:05 +0000
commit6c0dfd2e8e89d841587f3b601e2eaf8a358eb98e (patch)
treec0e82ece8dd47bdd3d0d142953d8b494c0b40023 /synapse/api
parentReword confusing sentence in CHANGES. (diff)
parentGive `public_baseurl` a default value (#9159) (diff)
downloadsynapse-6c0dfd2e8e89d841587f3b601e2eaf8a358eb98e.tar.xz
Merge remote-tracking branch 'origin/develop' into release-v1.26.0
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/urls.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/api/urls.py b/synapse/api/urls.py
index 6379c86dde..e36aeef31f 100644
--- a/synapse/api/urls.py
+++ b/synapse/api/urls.py
@@ -42,8 +42,6 @@ class ConsentURIBuilder:
         """
         if hs_config.form_secret is None:
             raise ConfigError("form_secret not set in config")
-        if hs_config.public_baseurl is None:
-            raise ConfigError("public_baseurl not set in config")
 
         self._hmac_secret = hs_config.form_secret.encode("utf-8")
         self._public_baseurl = hs_config.public_baseurl