Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

78015948

Commit 78015948 authored 10 years ago by Erik Johnston

Downloads
- Patches
- Plain Diff

Initial implementation of auth conflict resolution

parent 5a3a15f5

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

synapse/events/utils.py 4 additions, 2 deletions

synapse/events/utils.py
synapse/federation/federation_client.py 1 addition, 1 deletion

synapse/federation/federation_client.py
synapse/federation/federation_server.py 33 additions, 0 deletions

synapse/federation/federation_server.py
synapse/federation/transport/client.py 16 additions, 0 deletions

synapse/federation/transport/client.py
synapse/federation/transport/server.py 20 additions, 1 deletion

synapse/federation/transport/server.py
synapse/handlers/federation.py 132 additions, 75 deletions

synapse/handlers/federation.py
synapse/storage/rejections.py 2 additions, 2 deletions

synapse/storage/rejections.py
tests/handlers/test_federation.py 2 additions, 0 deletions

tests/handlers/test_federation.py

with 210 additions and 81 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