Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

652a6b09

Commit 652a6b09 authored 3 years ago by Brendan Abolivier

Downloads
- Plain Diff

Merge branch 'master' into develop

parents dc6366a9 d1473f73

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 16 additions, 0 deletions

CHANGES.md
changelog.d/9946.misc 0 additions, 1 deletion

changelog.d/9946.misc
debian/changelog 6 additions, 0 deletions

debian/changelog
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/config/tls.py 2 additions, 2 deletions

synapse/config/tls.py
synapse/push/push_rule_evaluator.py 3 additions, 52 deletions

synapse/push/push_rule_evaluator.py
synapse/util/__init__.py 47 additions, 14 deletions

synapse/util/__init__.py
tests/federation/test_federation_server.py 19 additions, 0 deletions

tests/federation/test_federation_server.py
tests/push/test_push_rule_evaluator.py 166 additions, 0 deletions

tests/push/test_push_rule_evaluator.py
tests/util/test_glob_to_regex.py 59 additions, 0 deletions

tests/util/test_glob_to_regex.py

with 319 additions and 70 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