Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

41b35412

Commit 41b35412 authored 8 years ago by Mark Haines Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #863 from matrix-org/markjh/load_config

Add function to load config without generating it

parents 16a88842 7dbb4733

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

synapse/app/homeserver.py 1 addition, 2 deletions

synapse/app/homeserver.py
synapse/config/_base.py 104 additions, 43 deletions

synapse/config/_base.py
tests/config/test_generate.py 1 addition, 1 deletion

tests/config/test_generate.py
tests/config/test_load.py 20 additions, 2 deletions

tests/config/test_load.py

with 126 additions and 48 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