Merge pull request #1879 from matrix-org/travis/fix-capabilities

Correctly nest the capabilities response object
6 years ago · 72242e4ebb
parent 48569c2156 d31d2f5e57
commit 72242e4ebb
2 changed files with 37 additions and 32 deletions
--- a/api/client-server/capabilities.yaml
+++ b/api/client-server/capabilities.yaml
@ -62,11 +62,15 @@ paths:
          schema:
            type: object
            required: ["capabilities"]
-            additionalProperties:
+            properties:
+              capabilities:
                type: object
+                title: Capabilities
                description: |-
                    The custom capabilities the server supports, using the
                    Java package naming convention.
+                additionalProperties:
+                  type: object
                properties:
                  "m.change_password":
                    type: object
--- a/changelogs/client_server/newsfragments/1879.feature
+++ b/changelogs/client_server/newsfragments/1879.feature
@ -0,0 +1 @@
+Support optional features by having clients query for capabilities.
				`@ -0,0 +1 @@`
				`Support optional features by having clients query for capabilities.`