12268 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Kaye	d1b7c0ca05	Docker build all tags starting vX.Y.Z, inc RCs ... Note the regex must match the complete string anyway, so the leading ^ was useless.	2018-10-03 11:52:05 +01:00
Amber Brown	ed763aeba8	some changelog fixes	2018-10-03 02:27:41 +10:00
Amber Brown	ccce6f26a6	changelog	2018-10-03 02:16:21 +10:00
Amber Brown	da8f82008d	version	2018-10-03 02:15:48 +10:00
Erik Johnston	25baf3b2ac	Merge pull request #3991 from matrix-org/erikj/fix_pop_retry_cache ... Fix bug when invalidating destination retry timings	2018-10-02 16:42:28 +01:00
Erik Johnston	9c834b8ee9	Add tests	2018-10-02 16:22:39 +01:00
Amber Brown	058a4c665e	Remove Jenkins & other old dev junk (#3988)	2018-10-03 00:59:11 +10:00
Erik Johnston	8f614f842d	Newsfile	2018-10-02 15:54:31 +01:00
Erik Johnston	7258d081a5	Fix bug when invalidating destination retry timings	2018-10-02 15:47:57 +01:00
Richard van der Hoff	2b8d28b095	Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_error ... Fix error handling for missing auth_event	2018-10-02 13:57:54 +01:00
Amber Brown	7232917f12	Disable frozen dicts by default (#3987)	2018-10-02 22:53:47 +10:00
Erik Johnston	0f7033fb98	Merge pull request #3990 from matrix-org/erikj/fix_logging_lost_connection ... Fix error when logging incomplete requests	2018-10-02 14:10:05 +02:00
Erik Johnston	eeb755d17b	Newsfile	2018-10-02 12:06:25 +01:00
Erik Johnston	334e075dd8	Fix error when logging incomplete requests ... If a connection is lost before a request is read from Request, Twisted sets `method` (and `uri`) attributes to dummy values. These dummy values have incorrect types (i.e. they're not bytes), and so things like `__repr__` would raise an exception. To fix this we had a helper method to return the method with a consistent type.	2018-10-02 12:06:22 +01:00
Richard van der Hoff	8c41b0ca66	Merge pull request #3989 from matrix-org/rav/better_stacktraces ... Avoid reraise, to improve stacktraces	2018-10-02 10:47:38 +01:00
Erik Johnston	bc29946809	Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_state ... Fix lazy loaded sync with rejected state events	2018-10-02 11:38:35 +02:00
Richard van der Hoff	8174c6725b	Avoid reraise, to improve stacktraces	2018-10-01 18:50:34 +01:00
Richard van der Hoff	5908a8f6f5	Merge branch 'develop' into rav/fix_missing_create_event_error	2018-10-01 17:16:20 +01:00
Amber Brown	abdc141c2b	Update instructions to point to pip install (#3985)	2018-10-02 01:08:38 +10:00
Richard van der Hoff	b5b93f45d5	Merge pull request #3968 from matrix-org/rav/fix_federation_errors ... Fix exceptions when handling incoming transactions	2018-10-01 15:54:24 +01:00
Amber Brown	6e05fd032c	Fix userconsent on Python 3 (#3938)	2018-10-02 00:11:58 +10:00
Erik Johnston	5fa27eac78	Newsfile	2018-10-01 14:24:41 +01:00
Erik Johnston	82f922b4af	Fix lazy loaded sync with rejected state events ... In particular, we assume that the name and canonical alias events in the state have not been rejected. In practice this may not be the case (though we should probably think about fixing that) so lets ensure that we gracefully handle that case, rather than 404'ing the sync request like we do now.	2018-10-01 14:19:40 +01:00
Erik Johnston	8f5c23d0cd	Merge pull request #3933 from matrix-org/erikj/destination_retry_cache ... Add a five minute cache to get_destination_retry_timings	2018-10-01 14:20:30 +02:00
Richard van der Hoff	53c5fa4e6c	Further reduce the size of the docker image (#3972) ... Rewrite the dockerfile as a multistage build: this means we can get rid of a whole load of cruft which we don't need.	2018-10-01 12:29:17 +01:00
Erik Johnston	4f3e3ac192	Correctly match 'dict.pop' api	2018-10-01 12:25:27 +01:00
Erik Johnston	8ea887856c	Don't update eviction metrics on explicit removal	2018-10-01 12:00:58 +01:00
Bruno Windels	9a8bbc9a59	add --no-admin flag to registration script (#3836)	2018-09-28 13:36:56 +01:00
Richard van der Hoff	3deaad2fb4	Merge pull request #3964 from matrix-org/rav/remove_localhost_checks ... remove spurious federation checks on localhost	2018-09-28 13:35:47 +01:00
Richard van der Hoff	26557c9db4	Merge pull request #3980 from matrix-org/rav/remove_broken_cache_call ... Remove redundant call to start_get_pdu_cache	2018-09-28 13:13:19 +01:00
Richard van der Hoff	965154d60a	Fix complete fail to do the right thing	2018-09-28 12:45:54 +01:00
Jan Christian Grünhage	5304449738	build python 3 docker images on circle CI (#3976)	2018-09-28 12:36:35 +01:00
Richard van der Hoff	19475cf337	Remove redundant call to start_get_pdu_cache ... I think this got forgotten in #3932. We were getting away with it because it was the last call in this function.	2018-09-28 12:01:23 +01:00
Richard van der Hoff	9c8cec5dab	Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache	2018-09-28 10:51:09 +01:00
Richard van der Hoff	f094f715cf	Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors	2018-09-27 15:18:21 +01:00
Richard van der Hoff	36c62a67c4	Merge pull request #3794 from matrix-org/erikj/faster_typing ... Improve performance of getting typing updates for replication	2018-09-27 15:14:26 +01:00
Richard van der Hoff	b5c976347b	Merge pull request #3946 from matrix-org/michaelkaye/automate_docker_hub_upload ... Build and push docker image to hub automatically	2018-09-27 15:07:41 +01:00
Richard van der Hoff	e1e3e77bfd	Merge pull request #3967 from matrix-org/rav/federation_handler_cleanups ... Clarifications in FederationHandler	2018-09-27 15:06:59 +01:00
Amber Brown	6de3884e5e	Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_process ... Run notify_app_services as a bg process	2018-09-27 23:40:30 +10:00
Amber Brown	a512e637ac	Merge pull request #3970 from schnuffle/develop-py3 ... Replaced all occurences of e.message with str(e)	2018-09-27 23:39:45 +10:00
Amber Brown	b3064532d0	Run our oldest supported configuration in CI (#3952)	2018-09-27 23:21:54 +10:00
Amber Brown	861c063ebc	Update 3970.bugfix	2018-09-27 22:47:01 +10:00
Richard van der Hoff	484a9b8c81	Remove redundant, failing, test ... This test didn't do what it claimed to do, and what it claimed to do was the same as test_cant_hide_direct_ancestors anyway. This stuff is tested by sytest anyway.	2018-09-27 13:11:23 +01:00
Schnuffle	a873896096	Added changelog fragment	2018-09-27 14:01:44 +02:00
Schnuffle	dc5db01ff2	Replaced all occurences of e.message with str(e) ... Signed-off-by: Schnuffle <schnuffle@github.com>	2018-09-27 13:38:50 +02:00
Richard van der Hoff	51d33d5178	Merge pull request #3961 from matrix-org/neilj/lock_mau_upserts ... fix #3854 MAU transaction errors	2018-09-27 12:31:37 +01:00
Michael Kaye	74bbdd0412	Do the changelog.d dance	2018-09-27 12:01:43 +01:00
Michael Kaye	8607397ea7	Make a ":latest" tag, and a SHA1 commit ID one too. ... Latest is horrible and makes debugging what has happened anywhere a nightmare. We push a latest because of demand for it, but we'll also push a SHA1 commit id so those wanting to know what they're running (and be able to roll back if required) can use those instead. Note that latest here is defined as "most recent master commit" not "most recent released version", as the actual semantics of making latest correct while still being able to build bugfixed releases of previous versions is just ARGH. So we define it as "master" not "latest release".	2018-09-27 12:01:41 +01:00
Michael Kaye	a3c11f7320	Also, don't run this job on any branches	2018-09-27 12:01:09 +01:00
Michael Kaye	73a089f461	Make username configurable in the UI too	2018-09-27 12:00:40 +01:00