Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

809e8567

Commit 809e8567 authored 5 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'rav/sso-confirm-whitelist' into 'release-v1.11.1'

Add a whitelist for the SSO confirmation step.

See merge request new-vector/synapse!3

parents 27d099ed b68041df

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

docs/sample_config.yaml 19 additions, 3 deletions

docs/sample_config.yaml
synapse/config/sso.py 18 additions, 0 deletions

synapse/config/sso.py
synapse/rest/client/v1/login.py 18 additions, 8 deletions

synapse/rest/client/v1/login.py
tests/rest/client/v1/test_login.py 29 additions, 3 deletions

tests/rest/client/v1/test_login.py

with 84 additions and 14 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