diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-09-18 13:07:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-18 13:07:01 +0100 |
| commit | 286d6930b71c8b357f5fc5099c7b5a94475ceab9 (patch) | |
| tree | c0aa9b1e1ba39ccec94eeee2e86bc5e06376f421 | |
| parent | Merge pull request #3882 from SimmyD/max_upload_docker_var (diff) | |
| parent | changelog (diff) | |
| download | synapse-286d6930b71c8b357f5fc5099c7b5a94475ceab9.tar.xz | |
Merge pull request #3879 from matrix-org/matthew/fix-autojoin
don't ratelimit autojoins
| -rw-r--r-- | changelog.d/3879.bugfix | 1 | ||||
| -rw-r--r-- | synapse/handlers/register.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/3879.bugfix b/changelog.d/3879.bugfix new file mode 100644 index 0000000000..82cb2a8ebc --- /dev/null +++ b/changelog.d/3879.bugfix @@ -0,0 +1 @@ +Don't ratelimit autojoins 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, ) |