Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

def64d6e

Commit def64d6e authored 8 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 1f0f5ffa 100e2c42

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

synapse/federation/federation_server.py 5 additions, 0 deletions

synapse/federation/federation_server.py
synapse/federation/transaction_queue.py 3 additions, 0 deletions

synapse/federation/transaction_queue.py
synapse/federation/transport/server.py 46 additions, 1 deletion

synapse/federation/transport/server.py
synapse/handlers/presence.py 1 addition, 1 deletion

synapse/handlers/presence.py
synapse/replication/resource.py 9 additions, 0 deletions

synapse/replication/resource.py
synapse/rest/__init__.py 2 additions, 0 deletions

synapse/rest/__init__.py
synapse/rest/client/v2_alpha/openid.py 96 additions, 0 deletions

synapse/rest/client/v2_alpha/openid.py
synapse/storage/__init__.py 3 additions, 1 deletion

synapse/storage/__init__.py
synapse/storage/events.py 149 additions, 11 deletions

synapse/storage/events.py
synapse/storage/openid.py 32 additions, 0 deletions

synapse/storage/openid.py
synapse/storage/registration.py 3 additions, 0 deletions

synapse/storage/registration.py
synapse/storage/schema/delta/32/openid.sql 9 additions, 0 deletions

synapse/storage/schema/delta/32/openid.sql
synapse/storage/transactions.py 121 additions, 44 deletions

synapse/storage/transactions.py

with 479 additions and 58 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