Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Terraform modules
- Service Desk

Snippets Groups Projects

6f431936

Unverified Commit 6f431936 authored 4 years ago by Brendan Abolivier Committed by GitHub 4 years ago

Downloads
- Plain Diff

Merge pull request #7315 from matrix-org/babolivier/request_token

Config option to inhibit 3PID errors on /requestToken

parents 0d775fcc 69ad7cc1

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

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

changelog.d/7315.feature
docs/sample_config.yaml 10 additions, 0 deletions

docs/sample_config.yaml
synapse/config/server.py 21 additions, 0 deletions

synapse/config/server.py
synapse/rest/client/v2_alpha/account.py 16 additions, 1 deletion

synapse/rest/client/v2_alpha/account.py
synapse/rest/client/v2_alpha/register.py 11 additions, 1 deletion

synapse/rest/client/v2_alpha/register.py
tests/rest/client/v2_alpha/test_account.py 16 additions, 0 deletions

tests/rest/client/v2_alpha/test_account.py
tests/rest/client/v2_alpha/test_register.py 46 additions, 1 deletion

tests/rest/client/v2_alpha/test_register.py

with 121 additions and 3 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