diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2017-08-11 07:26:54 +0200 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-08-11 07:26:54 +0200 |
| commit | 4e6138bd3196e2fd00596524f4ec49a6be83879e (patch) | |
| tree | 64cc67207aa4ac8bfba05d05f3b49b60b1009c91 /spec/fixtures | |
| parent | a64452990ed91e37ebd57758729220bbc05d4844 (diff) | |
| download | gitlab-ce-4e6138bd3196e2fd00596524f4ec49a6be83879e.tar.gz | |
Fix merge request json schema (add labels, milestone)
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request.json b/spec/fixtures/api/schemas/entities/merge_request.json index 2f12b671dec..1030f323a1f 100644 --- a/spec/fixtures/api/schemas/entities/merge_request.json +++ b/spec/fixtures/api/schemas/entities/merge_request.json @@ -18,6 +18,8 @@ "total_time_spent": { "type": "integer" }, "human_time_estimate": { "type": ["integer", "null"] }, "human_total_time_spent": { "type": ["integer", "null"] }, + "milestone": { "type": ["object", "null"] }, + "labels": { "type": ["array", "null"] }, "in_progress_merge_commit_sha": { "type": ["string", "null"] }, "merge_error": { "type": ["string", "null"] }, "merge_commit_sha": { "type": ["string", "null"] }, |