summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-09-18 13:07:01 +0100
committerGitHub <noreply@github.com>2018-09-18 13:07:01 +0100
commit286d6930b71c8b357f5fc5099c7b5a94475ceab9 (patch)
treec0aa9b1e1ba39ccec94eeee2e86bc5e06376f421 /synapse/handlers
parentMerge pull request #3882 from SimmyD/max_upload_docker_var (diff)
parentchangelog (diff)
downloadsynapse-286d6930b71c8b357f5fc5099c7b5a94475ceab9.tar.xz
Merge pull request #3879 from matrix-org/matthew/fix-autojoin
don't ratelimit autojoins
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/register.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 1e53f2c635..da914c46ff 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -534,4 +534,5 @@ class RegistrationHandler(BaseHandler):
             room_id=room_id,
             remote_room_hosts=remote_room_hosts,
             action="join",
+            ratelimit=False,
         )