Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/disable_hs

This commit is contained in:
Neil Johnson 2018-08-06 21:39:44 +01:00
commit 7bcf126b18

View file

@ -778,9 +778,6 @@ class Auth(object):
def check_auth_blocking(self): def check_auth_blocking(self):
"""Checks if the user should be rejected for some external reason, """Checks if the user should be rejected for some external reason,
such as monthly active user limiting or global disable flag such as monthly active user limiting or global disable flag
Args:
error (Error): The error that should be raised if user is to be
blocked
""" """
if self.hs.config.hs_disabled: if self.hs.config.hs_disabled:
raise AuthError( raise AuthError(