diff options
author | Douwe Maan <douwe@selenight.nl> | 2018-11-05 15:49:02 +0300 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2018-11-05 15:49:10 +0300 |
commit | 34e8d9726ddb63d1a9d05f6117d04da56aada5e3 (patch) | |
tree | 2a7b920be0772219a22ee58c3bc679f230672f8d /spec/fixtures | |
parent | 90473e064eac21be283e751005e0c7abbdbf9089 (diff) |
Expose {closed,merged}_{at,by} in merge requests API index
Diffstat (limited to 'spec/fixtures')
-rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/merge_requests.json | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/merge_requests.json b/spec/fixtures/api/schemas/public_api/v4/merge_requests.json index f7adc4e0b91..6df27bf32b9 100644 --- a/spec/fixtures/api/schemas/public_api/v4/merge_requests.json +++ b/spec/fixtures/api/schemas/public_api/v4/merge_requests.json @@ -9,6 +9,32 @@ "title": { "type": "string" }, "description": { "type": ["string", "null"] }, "state": { "type": "string" }, + "merged_by": { + "type": ["object", "null"], + "properties": { + "name": { "type": "string" }, + "username": { "type": "string" }, + "id": { "type": "integer" }, + "state": { "type": "string" }, + "avatar_url": { "type": "uri" }, + "web_url": { "type": "uri" } + }, + "additionalProperties": false + }, + "merged_at": { "type": ["date", "null"] }, + "closed_by": { + "type": ["object", "null"], + "properties": { + "name": { "type": "string" }, + "username": { "type": "string" }, + "id": { "type": "integer" }, + "state": { "type": "string" }, + "avatar_url": { "type": "uri" }, + "web_url": { "type": "uri" } + }, + "additionalProperties": false + }, + "closed_at": { "type": ["date", "null"] }, "created_at": { "type": "date" }, "updated_at": { "type": "date" }, "target_branch": { "type": "string" }, |