Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

69c49d3f

Unverified Commit 69c49d3f authored 6 years ago by Neil Johnson Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge branch 'develop' into neilj/limit_exceeded_error

parents 7edd1162 a2d872e7

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/3705.bugfix 1 addition, 0 deletions

changelog.d/3705.bugfix
changelog.d/3708.feature 1 addition, 0 deletions

changelog.d/3708.feature
changelog.d/3712.misc 1 addition, 0 deletions

changelog.d/3712.misc
docs/admin_api/register_api.rst 1 addition, 1 deletion

docs/admin_api/register_api.rst
synapse/api/auth.py 2 additions, 1 deletion

synapse/api/auth.py
synapse/app/federation_reader.py 2 additions, 0 deletions

synapse/app/federation_reader.py
synapse/app/homeserver.py 1 addition, 0 deletions

synapse/app/homeserver.py
synapse/handlers/message.py 5 additions, 1 deletion

synapse/handlers/message.py
synapse/handlers/room.py 4 additions, 0 deletions

synapse/handlers/room.py
synapse/storage/monthly_active_users.py 4 additions, 1 deletion

synapse/storage/monthly_active_users.py
tests/storage/test_monthly_active_users.py 13 additions, 0 deletions

tests/storage/test_monthly_active_users.py

with 35 additions and 4 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