Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

4601129c

Unverified Commit 4601129c authored 6 years ago by Neil Johnson Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #3687 from matrix-org/neilj/admin_email

support admin_email config and pass through into blocking errors,

parents 1c5e690a 39176f27

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/3687.feature 1 addition, 0 deletions

changelog.d/3687.feature
synapse/api/auth.py 6 additions, 2 deletions

synapse/api/auth.py
synapse/api/errors.py 10 additions, 6 deletions

synapse/api/errors.py
synapse/config/server.py 4 additions, 0 deletions

synapse/config/server.py
synapse/handlers/register.py 4 additions, 14 deletions

synapse/handlers/register.py
tests/api/test_auth.py 6 additions, 2 deletions

tests/api/test_auth.py
tests/handlers/test_register.py 4 additions, 4 deletions

tests/handlers/test_register.py
tests/handlers/test_sync.py 2 additions, 2 deletions

tests/handlers/test_sync.py
tests/utils.py 1 addition, 0 deletions

tests/utils.py

with 38 additions and 30 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