Merge branch 'master' into kegan/key-server-db

This commit is contained in:
Kegan Dougal 2020-07-15 11:33:01 +01:00
commit 9ea5dfb820
3 changed files with 8 additions and 1 deletions

4
.github/FUNDING.yml vendored Normal file
View file

@ -0,0 +1,4 @@
# One username per supported platform and one custom link
patreon: matrixdotorg
liberapay: matrixdotorg
custom: https://paypal.me/matrixdotorg

View file

@ -52,5 +52,9 @@ Remote invited user can see room metadata
# this test thinks it's all fine... # this test thinks it's all fine...
Inbound federation accepts a second soft-failed event Inbound federation accepts a second soft-failed event
# Relies on a rejected PL event which will never be accepted into the DAG
# Caused by https://github.com/matrix-org/sytest/pull/911
Outbound federation requests missing prev_events and then asks for /state_ids and resolves the state
# We don't implement lazy membership loading yet. # We don't implement lazy membership loading yet.
The only membership state included in a gapped incremental sync is for senders in the timeline The only membership state included in a gapped incremental sync is for senders in the timeline

View file

@ -281,7 +281,6 @@ Inbound federation of state requires event_id as a mandatory paramater
Inbound federation can get state_ids for a room Inbound federation can get state_ids for a room
Inbound federation of state_ids requires event_id as a mandatory paramater Inbound federation of state_ids requires event_id as a mandatory paramater
Federation rejects inbound events where the prev_events cannot be found Federation rejects inbound events where the prev_events cannot be found
Outbound federation requests missing prev_events and then asks for /state_ids and resolves the state
Alternative server names do not cause a routing loop Alternative server names do not cause a routing loop
Events whose auth_events are in the wrong room do not mess up the room state Events whose auth_events are in the wrong room do not mess up the room state
Inbound federation can return events Inbound federation can return events