Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

0d81a6fa

Commit 0d81a6fa authored 4 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'social_login' into develop

parents 4b73488e a083aea3

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/9183.feature 1 addition, 1 deletion

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

changelog.d/9242.feature
changelog.d/9245.feature 1 addition, 0 deletions

changelog.d/9245.feature
docs/openid.md 3 additions, 0 deletions

docs/openid.md
docs/sample_config.yaml 21 additions, 7 deletions

docs/sample_config.yaml
synapse/config/oidc_config.py 39 additions, 28 deletions

synapse/config/oidc_config.py
synapse/handlers/cas_handler.py 2 additions, 1 deletion

synapse/handlers/cas_handler.py
synapse/handlers/oidc_handler.py 31 additions, 24 deletions

synapse/handlers/oidc_handler.py
synapse/handlers/saml_handler.py 2 additions, 1 deletion

synapse/handlers/saml_handler.py
synapse/handlers/sso.py 5 additions, 0 deletions

synapse/handlers/sso.py
synapse/rest/client/v1/login.py 2 additions, 0 deletions

synapse/rest/client/v1/login.py

with 108 additions and 62 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