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

Commit f300c08

Browse files
committed
Merge branch 'develop' of github.com:matrix-org/synapse into hawkowl/cache-config-without-synctl
* 'develop' of github.com:matrix-org/synapse: (76 commits) 1.12.4 Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_token"" Revert "Merge pull request #7315 from matrix-org/babolivier/request_token" Stop the master relaying USER_SYNC for other workers (#7318) Config option to inhibit 3PID errors on /requestToken Fix replication metrics when using redis (#7325) formatting for the changelog Another go at fixing one-word commands (#7326) 1.12.4rc1 1.12.4rc1 fix changelog name Extend StreamChangeCache to support multiple entities per stream ID (#7303) Extend room admin api with additional attributes (#7225) Add ability to run replication protocol over redis. (#7040) Do not treat display names as globs for push rules. (#7271) Reduce logging verbosity of URL cache cleanup. (#7295) Query missing cross-signing keys on local sig upload (#7289) import urllib.parse when using urllib.parse.quote (#7319) Reduce federation logging on success (#7321) Fix changelog file ...
2 parents 905c833 + 68384d9 commit f300c08

File tree

179 files changed

+5087
-2534
lines changed

Some content is hidden

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

179 files changed

+5087
-2534
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/6899.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Improve error responses when accessing remote public room lists.

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/7160.feature

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

changelog.d/7185.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Move client command handling out of TCP protocol.

changelog.d/7186.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Support SSO in the user interactive authentication workflow.

changelog.d/7187.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Move server command handling out of TCP protocol.

changelog.d/7192.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove sent outbound device list pokes from the database.

0 commit comments

Comments
 (0)