Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email
Showing
- .circleci/config.yml 48 additions, 0 deletions.circleci/config.yml
- .dockerignore 3 additions, 0 deletions.dockerignore
- MANIFEST.in 1 addition, 0 deletionsMANIFEST.in
- changelog.d/3660.misc 1 addition, 0 deletionschangelog.d/3660.misc
- changelog.d/3669.misc 1 addition, 0 deletionschangelog.d/3669.misc
- changelog.d/3670.feature 1 addition, 0 deletionschangelog.d/3670.feature
- changelog.d/3681.bugfix 1 addition, 0 deletionschangelog.d/3681.bugfix
- changelog.d/3684.misc 1 addition, 0 deletionschangelog.d/3684.misc
- changelog.d/3692.bugfix 1 addition, 0 deletionschangelog.d/3692.bugfix
- docker/Dockerfile 1 addition, 1 deletiondocker/Dockerfile
- synapse/api/auth.py 11 additions, 1 deletionsynapse/api/auth.py
- synapse/handlers/sync.py 11 additions, 2 deletionssynapse/handlers/sync.py
- synapse/storage/monthly_active_users.py 34 additions, 22 deletionssynapse/storage/monthly_active_users.py
- tests/handlers/test_sync.py 71 additions, 0 deletionstests/handlers/test_sync.py
- tests/rest/client/v1/test_typing.py 29 additions, 37 deletionstests/rest/client/v1/test_typing.py
- tests/storage/test_client_ips.py 6 additions, 6 deletionstests/storage/test_client_ips.py
- tests/storage/test_monthly_active_users.py 8 additions, 7 deletionstests/storage/test_monthly_active_users.py
- tests/unittest.py 144 additions, 0 deletionstests/unittest.py
Loading
Please register or sign in to comment