Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

deb4fe6e

Unverified Commit deb4fe6e authored 5 years ago by Brendan Abolivier Committed by GitHub 5 years ago

Downloads
- Plain Diff

Merge pull request #5534 from matrix-org/babolivier/federation-publicrooms

Split public rooms directory auth config in two

parents 25433f21 bfe84e05

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

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

changelog.d/5534.feature
docs/sample_config.yaml 8 additions, 4 deletions

docs/sample_config.yaml
synapse/config/server.py 34 additions, 10 deletions

synapse/config/server.py
synapse/federation/transport/server.py 4 additions, 4 deletions

synapse/federation/transport/server.py
synapse/rest/client/v1/room.py 1 addition, 1 deletion

synapse/rest/client/v1/room.py
tests/rest/client/v1/test_rooms.py 1 addition, 1 deletion

tests/rest/client/v1/test_rooms.py

with 49 additions and 20 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