Commit Graph

11735 Commits (dc56c47dc0991c4ddd5de59224c5f55c8fad5287)
 

Author SHA1 Message Date
Erik Johnston dc56c47dc0
Merge pull request #3653 from matrix-org/erikj/split_federation 6 years ago
Neil Johnson 4601129c44
Merge pull request #3687 from matrix-org/neilj/admin_email 6 years ago
Erik Johnston ef184caf30 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_federation 6 years ago
Erik Johnston 488ffe6fdb Use federation handler function rather than duplicate 6 years ago
Erik Johnston 773db62a22 Rename slave TransactionStore to SlaveTransactionStore 6 years ago
Neil Johnson 39176f27f7 remove changelog referencing another PR 6 years ago
Neil Johnson 87a824bad1 clean up AuthError 6 years ago
Neil Johnson c4eb97518f Merge branch 'neilj/update_limits_error_codes' of github.com:matrix-org/synapse into neilj/admin_email 6 years ago
Neil Johnson 55afba0fc5 update admin email to uri 6 years ago
Neil Johnson 75c663c7b9 update error codes 6 years ago
Neil Johnson 1c5e690a6b
Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name 6 years ago
Erik Johnston fef2e65d12
Merge pull request #3667 from matrix-org/erikj/fixup_unbind 6 years ago
Neil Johnson 596ce63576 update resource limit error codes 6 years ago
Neil Johnson b8429c7c81 update error codes for resource limiting 6 years ago
Neil Johnson ab035bdeac replace admin_email with admin_uri for greater flexibility 6 years ago
Neil Johnson 19b433e3f4 Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email 6 years ago
Neil Johnson 70e48cbbb1 Merge branch 'develop' of github.com:matrix-org/synapse into neilj/change_prometheus_mau_metric_name 6 years ago
Neil Johnson aa3220df6a
Merge pull request #3692 from matrix-org/neil/fix_postgres_test_initialise_reserved_users 6 years ago
Neil Johnson 7277216d01 fix setup_test_homeserver to be postgres compatible 6 years ago
Neil Johnson cd0c749c4f Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved_users 6 years ago
Neil Johnson 9ecbaf8ba8 adding missing yield 6 years ago
Neil Johnson 1522ed9c07 in case max_mau is less than I think 6 years ago
Neil Johnson 629f390035 Rename MAU prometheus metric 6 years ago
Neil Johnson e5962f845c pep8 6 years ago
Neil Johnson e7d091fb86 combine mau metrics into one group 6 years ago
Neil Johnson 414d54b61a
Merge pull request #3670 from matrix-org/neilj/mau_sync_block 6 years ago
Neil Johnson 2545993ce4 make comments clearer 6 years ago
Neil Johnson c74c71128d remove blank line 6 years ago
Neil Johnson 99ebaed8e6
Update register.py 6 years ago
Amber Brown 614e6d517d
Dockerised sytest (#3660) 6 years ago
Amber Brown 0bdc362598
Merge pull request #3681 from matrix-org/neilj/fix_reap_users_in_postgres 6 years ago
Amber Brown 591bf87c6a Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_postgres 6 years ago
Amber Brown bdfbd934d6
Implement a new test baseclass to cut down on boilerplate (#3684) 6 years ago
Jan Christian Grünhage 8f0c430ca4
Merge pull request #3669 from matrix-org/jcgruenhage/update-docker-base 6 years ago
Neil Johnson 1f24d8681b set admin email via config 6 years ago
Neil Johnson f4b49152e2 support admin_email config and pass through into blocking errors, return AuthError in all cases 6 years ago
Richard van der Hoff 8ba2dac6ea Name changelog after PR, not bug 6 years ago
Richard van der Hoff 50bcaf1a27 Merge pull request #3677 from andrewshadura/master 6 years ago
Neil Johnson ce7de9ae6b Revert "support admin_email config and pass through into blocking errors, return AuthError in all cases" 6 years ago
Neil Johnson 0d43f991a1 support admin_email config and pass through into blocking errors, return AuthError in all cases 6 years ago
Amber Brown 99dd975dae
Run tests under PostgreSQL (#3423) 6 years ago
Neil Johnson ac205a54b2 Fixes test_reap_monthly_active_users so it passes under postgres 6 years ago
Neil Johnson 31fa743567 fix sqlite/postgres incompatibility in reap_monthly_active_users 6 years ago
Amber Brown a001038b92
Merge pull request #3679 from matrix-org/hawkowl/blackify-tests 6 years ago
Amber Brown 807449d8f2 fix up a forced long line 6 years ago
Richard van der Hoff c31793a784 Merge branch 'rav/fix_linearizer_cancellation' into develop 6 years ago
Richard van der Hoff c08f9d95b2 log *after* reloading log config 6 years ago
Amber Brown dd16e7dfcc changelog 6 years ago
black 8b3d9b6b19 Run black. 6 years ago
Amber Brown b37c472419
Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) 6 years ago