Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

b69f76c1

Commit b69f76c1 authored 8 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_fed_txn

parents 4d9b5c60 0cf2a649

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.rst 28 additions, 0 deletions

CHANGES.rst
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/api/errors.py 1 addition, 0 deletions

synapse/api/errors.py
synapse/api/filtering.py 45 additions, 0 deletions

synapse/api/filtering.py
synapse/events/utils.py 98 additions, 4 deletions

synapse/events/utils.py
synapse/handlers/sync.py 22 additions, 9 deletions

synapse/handlers/sync.py
synapse/rest/client/v2_alpha/register.py 11 additions, 0 deletions

synapse/rest/client/v2_alpha/register.py
synapse/rest/client/v2_alpha/sync.py 13 additions, 10 deletions

synapse/rest/client/v2_alpha/sync.py
synapse/storage/filtering.py 8 additions, 0 deletions

synapse/storage/filtering.py
tests/events/test_utils.py 169 additions, 1 deletion

tests/events/test_utils.py

with 396 additions and 25 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