Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

a38d4624

Commit a38d4624 authored 8 years ago by Erik Johnston Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #1140 from matrix-org/erikj/typing_fed_timeout

Time out typing over federation

parents aab6a31c 655891d1

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

synapse/federation/federation_client.py 0 additions, 2 deletions

synapse/federation/federation_client.py
synapse/handlers/typing.py 107 additions, 70 deletions

synapse/handlers/typing.py
synapse/rest/client/v1/room.py 4 additions, 1 deletion

synapse/rest/client/v1/room.py
tests/handlers/test_typing.py 2 additions, 5 deletions

tests/handlers/test_typing.py
tests/rest/client/v1/test_typing.py 1 addition, 4 deletions

tests/rest/client/v1/test_typing.py
tests/utils.py 8 additions, 1 deletion

tests/utils.py

with 122 additions and 83 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment