Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 11430c0

Browse files
anoadragon453anoadragon453
committed
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/async_is_server_admin
* 'develop' of github.com:matrix-org/synapse: (75 commits) Add instance name to RDATA/POSITION commands (#7364) Don't relay REMOTE_SERVER_UP cmds to same conn. (#7352) Fix limit logic for EventsStream (#7358) Fix fallback value for account_threepid_delegates.email (#7316) Clean up admin api docs (#7361) Return total number of users and profile attributes in admin users endpoint (#6881) Add some replication tests (#7278) Fix typo 'datbases' in ConfigError Fix collation for postgres for unit tests (#7359) Run replication streamers on workers (#7146) Fix incorrect metrics reporting for renew_attestations (#7344) Document monitoring workers (#7357) Add some explanation to application_services.md (#7091) Don't crash when one of the configuration files is empty (#7341) Add documentation to the sample config about the templates for SSO. (#7343) Convert some of the federation handler methods to async/await. (#7338) changelog Fix EventsStream raising assertions when it falls behind 1.12.4 Make it clear that the limit for an update_function is a target ...
2 parents d85228f + 37f6823 commit 11430c0

File tree

166 files changed

+5143
-1752
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+5143
-1752
lines changed

‎.buildkite/worker-blacklist‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ Message history can be paginated
55

66
Can re-join room if re-invited
77

8-
/upgrade creates a new room
9-
108
The only membership state included in an initial sync is for all the senders in the timeline
119

1210
Local device key changes get to remote servers

‎CHANGES.md‎

Lines changed: 43 additions & 11 deletions

‎UPGRADE.rst‎

Lines changed: 65 additions & 0 deletions

‎changelog.d/6881.misc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Return total number of users and profile attributes in admin users endpoint. Contributed by Awesome Technologies Innovationslabor GmbH.

‎changelog.d/7040.feature‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add support for running replication over Redis when using workers.

‎changelog.d/7091.doc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Improve the documentation of application service configuration files.

‎changelog.d/7146.misc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Run replication streamers on workers.

‎changelog.d/7160.feature‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎changelog.d/7213.misc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add explicit Python build tooling as dependencies for the snapcraft build.

‎changelog.d/7225.misc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Extend room admin api (`GET /_synapse/admin/v1/rooms`) with additional attributes.

0 commit comments

Comments
 (0)