summary refs log tree commit diff
path: root/synapse/handlers/identity.py
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/handlers/identity.py
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/handlers/identity.py')
-rw-r--r--synapse/handlers/identity.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py
index c05036ad1f..f61844d688 100644
--- a/synapse/handlers/identity.py
+++ b/synapse/handlers/identity.py
@@ -476,8 +476,6 @@ class IdentityHandler(BaseHandler):
         except RequestTimedOutError:
             raise SynapseError(500, "Timed out contacting identity server")
 
-        assert self.hs.config.public_baseurl
-
         # we need to tell the client to send the token back to us, since it doesn't
         # otherwise know where to send it, so add submit_url response parameter
         # (see also MSC2078)