Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Terraform modules
- Service Desk

Snippets Groups Projects

0bba2799

Commit 0bba2799 authored 8 years ago by David Baker

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into dbkr/contains_display_name_override

parents 1594eba2 16284039

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

jenkins-unittests.sh 1 addition, 0 deletions

jenkins-unittests.sh
synapse/handlers/auth.py 3 additions, 3 deletions

synapse/handlers/auth.py
synapse/handlers/federation.py 5 additions, 4 deletions

synapse/handlers/federation.py
synapse/push/pusherpool.py 4 additions, 4 deletions

synapse/push/pusherpool.py
synapse/replication/slave/storage/_base.py 1 addition, 1 deletion

synapse/replication/slave/storage/_base.py
synapse/replication/slave/storage/registration.py 1 addition, 1 deletion

synapse/replication/slave/storage/registration.py
synapse/rest/media/v1/preview_url_resource.py 195 additions, 159 deletions

synapse/rest/media/v1/preview_url_resource.py
synapse/storage/_base.py 1 addition, 0 deletions

synapse/storage/_base.py
synapse/storage/events.py 2 additions, 1 deletion

synapse/storage/events.py
synapse/storage/registration.py 32 additions, 38 deletions

synapse/storage/registration.py
tests/test_preview.py 79 additions, 1 deletion

tests/test_preview.py

with 324 additions and 212 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