diff options
| author | Eric Eastwood <erice@element.io> | 2023-06-16 14:12:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-16 14:12:24 -0500 |
| commit | 0f02f0b4da92229e88e27a92ea3bfa523457bfc1 (patch) | |
| tree | 32d565a9d015b96f8836c384e290ee903fab1e86 /docker | |
| parent | Don't always lock "user_ips" table when performing non-native upsert (#15788) (diff) | |
| download | synapse-0f02f0b4da92229e88e27a92ea3bfa523457bfc1.tar.xz | |
Remove experimental MSC2716 implementation to incrementally import history into existing rooms (#15748)
Context for why we're removing the implementation: - https://github.com/matrix-org/matrix-spec-proposals/pull/2716#issuecomment-1487441010 - https://github.com/matrix-org/matrix-spec-proposals/pull/2716#issuecomment-1504262734 Anyone wanting to continue MSC2716, should also address these leftover tasks: https://github.com/matrix-org/synapse/issues/10737 Closes https://github.com/matrix-org/synapse/issues/10737 in the fact that it is not longer necessary to track those things.
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/complement/conf/workers-shared-extra.yaml.j2 | 2 | ||||
| -rwxr-xr-x | docker/configure_workers_and_start.py | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/docker/complement/conf/workers-shared-extra.yaml.j2 b/docker/complement/conf/workers-shared-extra.yaml.j2 index 63acf86a46..2b11b487f6 100644 --- a/docker/complement/conf/workers-shared-extra.yaml.j2 +++ b/docker/complement/conf/workers-shared-extra.yaml.j2 @@ -92,8 +92,6 @@ allow_device_name_lookup_over_federation: true ## Experimental Features ## experimental_features: - # Enable history backfilling support - msc2716_enabled: true # client-side support for partial state in /send_join responses faster_joins: true # Enable support for polls diff --git a/docker/configure_workers_and_start.py b/docker/configure_workers_and_start.py index 87a740e3d4..62fb88daab 100755 --- a/docker/configure_workers_and_start.py +++ b/docker/configure_workers_and_start.py @@ -244,7 +244,6 @@ WORKERS_CONFIG: Dict[str, Dict[str, Any]] = { "^/_matrix/client/(api/v1|r0|v3|unstable)/join/", "^/_matrix/client/(api/v1|r0|v3|unstable)/knock/", "^/_matrix/client/(api/v1|r0|v3|unstable)/profile/", - "^/_matrix/client/(v1|unstable/org.matrix.msc2716)/rooms/.*/batch_send", ], "shared_extra_conf": {}, "worker_extra_conf": "", |