Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

70e48cbb

Commit 70e48cbb authored 6 years ago by Neil Johnson

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into...

Merge branch 'develop' of github.com:matrix-org/synapse into neilj/change_prometheus_mau_metric_name

parents 629f3900 aa3220df

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/3670.feature 1 addition, 0 deletions

changelog.d/3670.feature
changelog.d/3692.bugfix 1 addition, 0 deletions

changelog.d/3692.bugfix
synapse/api/auth.py 11 additions, 1 deletion

synapse/api/auth.py
synapse/handlers/sync.py 11 additions, 2 deletions

synapse/handlers/sync.py
synapse/storage/monthly_active_users.py 6 additions, 6 deletions

synapse/storage/monthly_active_users.py
tests/handlers/test_sync.py 71 additions, 0 deletions

tests/handlers/test_sync.py
tests/storage/test_client_ips.py 6 additions, 6 deletions

tests/storage/test_client_ips.py
tests/storage/test_monthly_active_users.py 8 additions, 7 deletions

tests/storage/test_monthly_active_users.py

with 115 additions and 22 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