summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-03-04 09:02:33 +0000
committerErik Johnston <erik@matrix.org>2016-03-04 09:02:33 +0000
commitdd463e246d507864dc9f195cfdb9b3147efc67f3 (patch)
treed8913b953755a95a50dac39f4516fe63f018f5e4 /synapse/rest
parentMerge pull request #615 from matrix-org/rav/SYN-642 (diff)
parentAllow alias creators to delete aliases (diff)
downloadsynapse-dd463e246d507864dc9f195cfdb9b3147efc67f3.tar.xz
Merge pull request #614 from matrix-org/erikj/alias_delete
Allow alias creators to delete aliases
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v1/directory.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/directory.py b/synapse/rest/client/v1/directory.py

index 8c1a2614a0..8bfe9fdea8 100644 --- a/synapse/rest/client/v1/directory.py +++ b/synapse/rest/client/v1/directory.py
@@ -122,9 +122,6 @@ class ClientDirectoryServer(ClientV1RestServlet): requester = yield self.auth.get_user_by_req(request) user = requester.user - is_admin = yield self.auth.is_server_admin(user) - if not is_admin: - raise AuthError(403, "You need to be a server admin") room_alias = RoomAlias.from_string(room_alias)