Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

c85e0633

Unverified Commit c85e0633 authored 6 years ago by Erik Johnston Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #4051 from matrix-org/erikj/alias_disallow_list

Add config option to control alias creation

parents 95ad1288 b94a43d5

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

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

changelog.d/4051.feature
synapse/config/homeserver.py 2 additions, 1 deletion

synapse/config/homeserver.py
synapse/config/room_directory.py 102 additions, 0 deletions

synapse/config/room_directory.py
synapse/federation/federation_server.py 2 additions, 14 deletions

synapse/federation/federation_server.py
synapse/handlers/directory.py 9 additions, 0 deletions

synapse/handlers/directory.py
synapse/util/__init__.py 25 additions, 0 deletions

synapse/util/__init__.py
tests/config/test_room_directory.py 67 additions, 0 deletions

tests/config/test_room_directory.py
tests/handlers/test_directory.py 48 additions, 0 deletions

tests/handlers/test_directory.py

with 256 additions and 15 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