Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

5fee9d80

Unverified Commit 5fee9d80 authored 6 years ago by Erik Johnston Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #4869 from matrix-org/erikj/yaml_load

Fix yaml warnings by using safe_load

parents 224783a7 d21a4d6b

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/4869.misc 1 addition, 0 deletions

changelog.d/4869.misc
scripts-dev/convert_server_keys.py 1 addition, 1 deletion

scripts-dev/convert_server_keys.py
synapse/config/_base.py 3 additions, 3 deletions

synapse/config/_base.py
synapse/config/appservice.py 1 addition, 1 deletion

synapse/config/appservice.py
synapse/config/logger.py 1 addition, 1 deletion

synapse/config/logger.py
synctl 2 additions, 2 deletions

synctl
tests/config/test_load.py 1 addition, 1 deletion

tests/config/test_load.py
tests/config/test_room_directory.py 2 additions, 2 deletions

tests/config/test_room_directory.py

with 12 additions and 11 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