Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

ca90336a

Commit ca90336a authored 6 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/account_expiration

parents eaf41a94 91934025

No related branches found

No related tags found

Loading

Changes 214

Expand all Hide whitespace changes

Inline Side-by-side

Showing

tests/rest/client/v2_alpha/test_capabilities.py 2 additions, 2 deletions

tests/rest/client/v2_alpha/test_capabilities.py
tests/server.py 35 additions, 21 deletions

tests/server.py
tests/state/test_v2.py 4 additions, 3 deletions

tests/state/test_v2.py
tests/storage/test_keys.py 63 additions, 20 deletions

tests/storage/test_keys.py
tests/storage/test_presence.py 0 additions, 118 deletions

tests/storage/test_presence.py
tests/storage/test_redaction.py 5 additions, 4 deletions

tests/storage/test_redaction.py
tests/storage/test_roommember.py 3 additions, 2 deletions

tests/storage/test_roommember.py
tests/storage/test_state.py 3 additions, 2 deletions

tests/storage/test_state.py
tests/test_event_auth.py 5 additions, 5 deletions

tests/test_event_auth.py
tests/test_state.py 3 additions, 2 deletions

tests/test_state.py
tests/test_visibility.py 4 additions, 4 deletions

tests/test_visibility.py
tests/unittest.py 1 addition, 1 deletion

tests/unittest.py
tests/util/test_linearizer.py 1 addition, 1 deletion

tests/util/test_linearizer.py
tests/utils.py 3 additions, 2 deletions

tests/utils.py

with 132 additions and 187 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