diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-09-02 11:55:18 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-09-02 11:55:18 +0000 |
| commit | 81002745184df28fc9d969afc524986279c653bb (patch) | |
| tree | 386724b936531148dfe98110aa214b6deb0aa84a /spec/fixtures | |
| parent | 1e60725174cf8cfac1b54bbcdb1453d74bfdd37e (diff) | |
| parent | 92edb3edab89dcb7b87bad3ac0fe7fed404fea85 (diff) | |
| download | gitlab-ce-81002745184df28fc9d969afc524986279c653bb.tar.gz | |
Merge branch 'issue-discussions-refactor' into 'master'
Issue discussions Vue refactor
See merge request !12069
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"] }, |