Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

431e4859

Commit 431e4859 authored 6 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 8dcfa6e7 4a3f1388

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/4415.feature 1 addition, 0 deletions

changelog.d/4415.feature
changelog.d/4466.misc 1 addition, 0 deletions

changelog.d/4466.misc
changelog.d/4468.misc 1 addition, 0 deletions

changelog.d/4468.misc
changelog.d/4476.misc 1 addition, 0 deletions

changelog.d/4476.misc
synapse/api/filtering.py 14 additions, 0 deletions

synapse/api/filtering.py
synapse/config/registration.py 3 additions, 3 deletions

synapse/config/registration.py
synapse/handlers/search.py 47 additions, 0 deletions

synapse/handlers/search.py
synapse/http/federation/matrix_federation_agent.py 10 additions, 0 deletions

synapse/http/federation/matrix_federation_agent.py
synapse/http/matrixfederationclient.py 0 additions, 1 deletion

synapse/http/matrixfederationclient.py
synapse/storage/engines/sqlite.py 1 addition, 2 deletions

synapse/storage/engines/sqlite.py
synapse/storage/state.py 24 additions, 0 deletions

synapse/storage/state.py
tests/http/federation/test_matrix_federation_agent.py 16 additions, 0 deletions

tests/http/federation/test_matrix_federation_agent.py
tests/http/test_fedclient.py 1 addition, 1 deletion

tests/http/test_fedclient.py

with 120 additions and 7 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