diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-08-30 15:38:53 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-08-30 15:38:53 +0100 |
| commit | 522a50eea61dd1465d582c838c91c7a36a6ac248 (patch) | |
| tree | 3f382a781fea6ff8eccd385a304caa57a7f9bd23 | |
| parent | Fix another false positive (diff) | |
| parent | Add m.id_access_token flag (#5930) (diff) | |
| download | synapse-anoa/remove_return_parans.tar.xz | |
Merge branch 'develop' into anoa/remove_return_parans github/anoa/remove_return_parans anoa/remove_return_parans
| -rw-r--r-- | changelog.d/5930.misc | 1 | ||||
| -rw-r--r-- | changelog.d/5938.misc | 1 | ||||
| -rwxr-xr-x | jenkins/prepare_synapse.sh | 16 | ||||
| -rw-r--r-- | synapse/rest/client/versions.py | 7 |
4 files changed, 8 insertions, 17 deletions
diff --git a/changelog.d/5930.misc b/changelog.d/5930.misc new file mode 100644 index 0000000000..81dcc10e6d --- /dev/null +++ b/changelog.d/5930.misc @@ -0,0 +1 @@ +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/changelog.d/5938.misc b/changelog.d/5938.misc new file mode 100644 index 0000000000..b5a3b6ee3b --- /dev/null +++ b/changelog.d/5938.misc @@ -0,0 +1 @@ +Remove unused jenkins/prepare_sytest.sh file. diff --git a/jenkins/prepare_synapse.sh b/jenkins/prepare_synapse.sh deleted file mode 100755 index 016afb8baa..0000000000 --- a/jenkins/prepare_synapse.sh +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/bash - -set -eux - -cd "`dirname $0`/.." - -TOX_DIR=$WORKSPACE/.tox - -mkdir -p $TOX_DIR - -if ! [ $TOX_DIR -ef .tox ]; then - ln -s "$TOX_DIR" .tox -fi - -# set up the virtualenv -tox -e py27 --notest -v diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py index 0e09191632..c51c9e617d 100644 --- a/synapse/rest/client/versions.py +++ b/synapse/rest/client/versions.py @@ -44,7 +44,12 @@ class VersionsRestServlet(RestServlet): "r0.5.0", ], # as per MSC1497: - "unstable_features": {"m.lazy_load_members": True}, + "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, + }, }, ) |