summary refs log tree commit diff
diff options
context:
space:
mode:
authorJ. Ryan Stinnett <jryans@gmail.com>2019-09-19 22:28:30 +0100
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-09-19 22:28:29 +0100
commit36015d68efccd2520ac0a569a5f8714544f6568c (patch)
tree6ac98f014bb091e853d548f28f0a26b719dc2a0f
parentUpdate the upgrade notes (#6050) (diff)
downloadsynapse-36015d68efccd2520ac0a569a5f8714544f6568c.tar.xz
Use unstable prefix for 3PID unbind API (#6062)
-rw-r--r--changelog.d/5980.feature2
-rw-r--r--changelog.d/6062.bugfix1
-rw-r--r--synapse/rest/client/v2_alpha/account.py2
3 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/5980.feature b/changelog.d/5980.feature
index f25d8d81d9..e20117cf1c 100644
--- a/changelog.d/5980.feature
+++ b/changelog.d/5980.feature
@@ -1 +1 @@
-Add POST /_matrix/client/r0/account/3pid/unbind endpoint from MSC2140 for unbinding a 3PID from an identity server without removing it from the homeserver user account.
\ No newline at end of file
+Add POST /_matrix/client/unstable/account/3pid/unbind endpoint from MSC2140 for unbinding a 3PID from an identity server without removing it from the homeserver user account.
diff --git a/changelog.d/6062.bugfix b/changelog.d/6062.bugfix
new file mode 100644
index 0000000000..e20117cf1c
--- /dev/null
+++ b/changelog.d/6062.bugfix
@@ -0,0 +1 @@
+Add POST /_matrix/client/unstable/account/3pid/unbind endpoint from MSC2140 for unbinding a 3PID from an identity server without removing it from the homeserver user account.
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py
index afaaeeacdd..ce1487dbc5 100644
--- a/synapse/rest/client/v2_alpha/account.py
+++ b/synapse/rest/client/v2_alpha/account.py
@@ -529,7 +529,7 @@ class ThreepidRestServlet(RestServlet):
 
 
 class ThreepidUnbindRestServlet(RestServlet):
-    PATTERNS = client_patterns("/account/3pid/unbind$")
+    PATTERNS = client_patterns("/account/3pid/unbind$", releases=(), unstable=True)
 
     def __init__(self, hs):
         super(ThreepidUnbindRestServlet, self).__init__()