Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

7fa1346f

Commit 7fa1346f authored 4 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'social_login' into develop

parents 17b71385 a737cc27

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

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

changelog.d/9183.feature
synapse/config/_base.pyi 2 additions, 0 deletions

synapse/config/_base.pyi
synapse/config/experimental.py 29 additions, 0 deletions

synapse/config/experimental.py
synapse/config/homeserver.py 2 additions, 0 deletions

synapse/config/homeserver.py
synapse/handlers/sso.py 18 additions, 5 deletions

synapse/handlers/sso.py
synapse/http/server.py 36 additions, 8 deletions

synapse/http/server.py
synapse/rest/client/v1/login.py 49 additions, 6 deletions

synapse/rest/client/v1/login.py
tests/rest/client/v1/test_login.py 92 additions, 0 deletions

tests/rest/client/v1/test_login.py
tests/utils.py 1 addition, 2 deletions

tests/utils.py

with 230 additions and 21 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