12050 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Neil Johnson	b586b8b986	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus	2018-08-14 17:43:22 +01:00
Neil Johnson	70e48cbbb1	Merge branch 'develop' of github.com:matrix-org/synapse into neilj/change_prometheus_mau_metric_name	2018-08-14 17:40:59 +01:00
Neil Johnson	aa3220df6a	Merge pull request #3692 from matrix-org/neil/fix_postgres_test_initialise_reserved_users ... Neil/fix postgres test initialise reserved users	2018-08-14 16:40:11 +00:00
Neil Johnson	7277216d01	fix setup_test_homeserver to be postgres compatible	2018-08-14 17:14:39 +01:00
Neil Johnson	cd0c749c4f	Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved_users	2018-08-14 17:06:51 +01:00
Neil Johnson	9ecbaf8ba8	adding missing yield	2018-08-14 16:55:28 +01:00
Neil Johnson	1522ed9c07	in case max_mau is less than I think	2018-08-14 16:52:30 +01:00
Neil Johnson	629f390035	Rename MAU prometheus metric	2018-08-14 16:38:05 +01:00
Neil Johnson	e5962f845c	pep8	2018-08-14 16:36:14 +01:00
Neil Johnson	e7d091fb86	combine mau metrics into one group	2018-08-14 16:26:55 +01:00
Neil Johnson	414d54b61a	Merge pull request #3670 from matrix-org/neilj/mau_sync_block ... Block ability to read via sync if mau limit exceeded	2018-08-14 15:21:31 +00:00
Neil Johnson	2545993ce4	make comments clearer	2018-08-14 15:48:12 +01:00
Neil Johnson	06b331ff40	fix off by 1 errors	2018-08-14 15:28:15 +01:00
Neil Johnson	8f9a7eb58d	support admin_email config and pass through into blocking errors, return AuthError in all cases	2018-08-14 15:11:54 +01:00
Neil Johnson	c74c71128d	remove blank line	2018-08-14 15:06:24 +01:00
Neil Johnson	ed4bc3d2fc	fix off by 1s on mau	2018-08-14 15:04:48 +01:00
Neil Johnson	bd92c8eaa7	Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus	2018-08-14 14:56:45 +01:00
Neil Johnson	99ebaed8e6	Update register.py ... remove comments	2018-08-14 14:55:55 +01:00
Neil Johnson	9b5bf3d858	Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus	2018-08-14 14:51:38 +01:00
Neil Johnson	e25d87d97b	Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus	2018-08-14 14:32:18 +01:00
Neil Johnson	e2c9fe0a6a	backout ability to pass in event type to server notices	2018-08-14 13:32:56 +01:00
Amber Brown	614e6d517d	Dockerised sytest (#3660)	2018-08-14 21:30:34 +10:00
Amber Brown	0bdc362598	Merge pull request #3681 from matrix-org/neilj/fix_reap_users_in_postgres ... Neilj/fix reap users in postgres	2018-08-14 21:29:35 +10:00
Amber Brown	591bf87c6a	Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_postgres	2018-08-14 20:56:23 +10:00
Amber Brown	bdfbd934d6	Implement a new test baseclass to cut down on boilerplate (#3684)	2018-08-14 20:53:43 +10:00
Neil Johnson	9b75c78b4d	support server notice state events for resource limits	2018-08-14 11:20:41 +01:00
Jan Christian Grünhage	8f0c430ca4	Merge pull request #3669 from matrix-org/jcgruenhage/update-docker-base ... update docker base-image to alpine 3.8	2018-08-14 11:43:59 +02:00
Neil Johnson	63417c31e9	fix typo	2018-08-13 22:36:52 +01:00
Neil Johnson	1f24d8681b	set admin email via config	2018-08-13 21:26:43 +01:00
Neil Johnson	f4b49152e2	support admin_email config and pass through into blocking errors, return AuthError in all cases	2018-08-13 21:09:47 +01:00
Richard van der Hoff	b6d55588e1	Changelog should link to PRs ... The changelog makes much more sense if it consistently links to PRs, rather than mostly PRs with the occasional issue #.	2018-08-13 18:56:55 +01:00
Richard van der Hoff	8ba2dac6ea	Name changelog after PR, not bug	2018-08-13 18:54:01 +01:00
Richard van der Hoff	50bcaf1a27	Merge pull request #3677 from andrewshadura/master ... Use recaptcha_ajax.js directly from Google	2018-08-13 18:52:56 +01:00
Richard van der Hoff	cd32c19a60	Merge pull request #3685 from matrix-org/revert-3677-master ... Revert "Use recaptcha_ajax.js directly from Google"	2018-08-13 18:49:50 +01:00
Richard van der Hoff	34f51babc5	Revert "Use recaptcha_ajax.js directly from Google"	2018-08-13 18:48:03 +01:00
Richard van der Hoff	8226e5597a	Merge pull request #3677 from andrewshadura/master ... Use recaptcha_ajax.js directly from Google	2018-08-13 18:47:51 +01:00
Neil Johnson	ce7de9ae6b	Revert "support admin_email config and pass through into blocking errors, return AuthError in all cases" ... This reverts commit 0d43f991a1.	2018-08-13 18:06:18 +01:00
Neil Johnson	0d43f991a1	support admin_email config and pass through into blocking errors, return AuthError in all cases	2018-08-13 18:00:23 +01:00
Amber Brown	99dd975dae	Run tests under PostgreSQL (#3423)	2018-08-13 16:47:46 +10:00
Neil Johnson	ac205a54b2	Fixes test_reap_monthly_active_users so it passes under postgres	2018-08-11 22:50:09 +01:00
Neil Johnson	31fa743567	fix sqlite/postgres incompatibility in reap_monthly_active_users	2018-08-11 22:38:34 +01:00
Neil Johnson	c79c4c0a7d	server notices for resource limit blocking	2018-08-10 15:25:47 +01:00
Neil Johnson	6c6aba76e1	implementation of server notices to alert on hitting resource limits	2018-08-10 15:12:59 +01:00
Amber Brown	a001038b92	Merge pull request #3679 from matrix-org/hawkowl/blackify-tests ... Blackify the tests	2018-08-11 00:12:56 +10:00
Amber Brown	807449d8f2	fix up a forced long line	2018-08-11 00:01:43 +10:00
Richard van der Hoff	c31793a784	Merge branch 'rav/fix_linearizer_cancellation' into develop	2018-08-10 14:57:27 +01:00
Richard van der Hoff	c08f9d95b2	log *after* reloading log config ... ... because logging *before* reloading means the log message gets lost in the old MemoryLogger	2018-08-10 14:56:48 +01:00
Amber Brown	dd16e7dfcc	changelog	2018-08-10 23:54:46 +10:00
black	8b3d9b6b19	Run black.	2018-08-10 23:54:09 +10:00
Amber Brown	b37c472419	Rename async to async_helpers because async is a keyword on Python 3.7 (#3678)	2018-08-10 23:50:21 +10:00