summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-24 17:55:03 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-24 17:55:03 +0000
commit0b2375dbbbf9661b87954d5666d9b499a7d0e526 (patch)
tree0a3f35393ca6080fac4be8d6870ff9c5fc4ec9aa
parent Remove unnecessary parentheses around return statements (#5931) (diff)
parentRevert "Add m.id_access_token flag (#5930)" (#5945) (diff)
downloadsynapse-0b2375dbbbf9661b87954d5666d9b499a7d0e526.tar.xz
Revert "Add m.id_access_token flag (#5930)" (#5945)
-rw-r--r--changelog.d/5930.misc1
-rw-r--r--synapse/rest/client/versions.py7
2 files changed, 1 insertions, 7 deletions
diff --git a/changelog.d/5930.misc b/changelog.d/5930.misc
deleted file mode 100644

index 81dcc10e6d..0000000000 --- a/changelog.d/5930.misc +++ /dev/null
@@ -1 +0,0 @@ -Add temporary flag to /versions in unstable_features to indicate this Synapse supports receiving id_access_token parameters on calls to identity server-proxying endpoints. \ No newline at end of file diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py
index c51c9e617d..0e09191632 100644 --- a/synapse/rest/client/versions.py +++ b/synapse/rest/client/versions.py
@@ -44,12 +44,7 @@ class VersionsRestServlet(RestServlet): "r0.5.0", ], # as per MSC1497: - "unstable_features": { - "m.lazy_load_members": True, - # as per https://github.com/matrix-org/synapse/issues/5927 - # to be removed in r0.6.0 - "m.id_access_token": True, - }, + "unstable_features": {"m.lazy_load_members": True}, }, )