summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-03-13 13:10:44 +0000
committerGitHub <noreply@github.com>2018-03-13 13:10:44 +0000
commit99e9b4f26c0ae4ad132fbc5e66c46478628c2538 (patch)
treea4c651022f38c075b51a4649be103da0cb73173d /synapse
parentMerge pull request #2975 from matrix-org/rav/measure_persist_events (diff)
parentRoomMembershipRestServlet doesn't handle /forget (diff)
downloadsynapse-99e9b4f26c0ae4ad132fbc5e66c46478628c2538.tar.xz
Merge pull request #2984 from matrix-org/erikj/fix_rest_regeix
RoomMembershipRestServlet doesn't handle /forget
Diffstat (limited to 'synapse')
-rw-r--r--synapse/rest/client/v1/room.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index 9d745174c7..f8999d64d7 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -599,7 +599,7 @@ class RoomMembershipRestServlet(ClientV1RestServlet):
     def register(self, http_server):
         # /rooms/$roomid/[invite|join|leave]
         PATTERNS = ("/rooms/(?P<room_id>[^/]*)/"
-                    "(?P<membership_action>join|invite|leave|ban|unban|kick|forget)")
+                    "(?P<membership_action>join|invite|leave|ban|unban|kick)")
         register_txn_path(self, PATTERNS, http_server)
 
     @defer.inlineCallbacks