diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-07 13:37:50 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-07 13:37:50 +0000 |
| commit | 1da5a103ace9c346758e9525d7f0fa55bab13599 (patch) | |
| tree | 34a492ec3b0ec833556a728faf1ece5a8f060b47 /spec/fixtures | |
| parent | 7e7f260dc54c7643e8d7ec8bf3fbded3dfc06fcc (diff) | |
| parent | dcdfa04b322db3905f6871a6857e7055c556547f (diff) | |
| download | gitlab-ce-1da5a103ace9c346758e9525d7f0fa55bab13599.tar.gz | |
Merge branch 'jprovazn-api' into 'master'
Add discussion API
See merge request gitlab-org/gitlab-ce!17510
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/notes.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/notes.json b/spec/fixtures/api/schemas/public_api/v4/notes.json index 6525f7c2c80..4c4ca3b582f 100644 --- a/spec/fixtures/api/schemas/public_api/v4/notes.json +++ b/spec/fixtures/api/schemas/public_api/v4/notes.json @@ -4,6 +4,7 @@ "type": "object", "properties" : { "id": { "type": "integer" }, + "type": { "type": ["string", "null"] }, "body": { "type": "string" }, "attachment": { "type": ["string", "null"] }, "author": { |