Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

d84f6525

Unverified Commit d84f6525 authored 7 years ago by Matthew Hodgson Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #2813 from matrix-org/matthew/registrations_require_3pid

add registrations_require_3pid and allow_local_3pids

parents b0d9e633 49fce046

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

synapse/api/errors.py 1 addition, 0 deletions

synapse/api/errors.py
synapse/config/registration.py 19 additions, 0 deletions

synapse/config/registration.py
synapse/handlers/register.py 7 additions, 1 deletion

synapse/handlers/register.py
synapse/rest/client/v1/register.py 23 additions, 11 deletions

synapse/rest/client/v1/register.py
synapse/rest/client/v2_alpha/account.py 21 additions, 0 deletions

synapse/rest/client/v2_alpha/account.py
synapse/rest/client/v2_alpha/register.py 58 additions, 11 deletions

synapse/rest/client/v2_alpha/register.py
synapse/util/threepids.py 48 additions, 0 deletions

synapse/util/threepids.py
tests/rest/client/v2_alpha/test_register.py 1 addition, 0 deletions

tests/rest/client/v2_alpha/test_register.py

with 178 additions and 23 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