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)

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"] },