Merge branch 'issue-discussions-refactor' of gitlab.com:gitlab-org/gitlab-ce…

Merge branch 'issue-discussions-refactor' of gitlab.com:gitlab-org/gitlab-ce into issue-discussions-refactor * 'issue-discussions-refactor' of gitlab.com:gitlab-org/gitlab-ce: Fix merge request json schema (add labels, milestone)

Merge branch 'issue-discussions-refactor' of gitlab.com:gitlab-org/gitlab-ce…
d542c2f1 · Filipa Lacerda · b219dcd0 · 4e6138bd · d542c2f1
Commit d542c2f1 authored Aug 11, 2017 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

merge_request.json spec/fixtures/api/schemas/entities/merge_request.json +2 -0

No files found.
--- 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"] },