From b7d58ff8b17623f64ac7835a590e79d916e758ac Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 14 Dec 2019 00:08:27 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/fixtures/api/schemas/entities/merge_request_noteable.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'spec/fixtures/api') diff --git a/spec/fixtures/api/schemas/entities/merge_request_noteable.json b/spec/fixtures/api/schemas/entities/merge_request_noteable.json index d37f5b864d7..c0eb320e67f 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_noteable.json +++ b/spec/fixtures/api/schemas/entities/merge_request_noteable.json @@ -1,6 +1,9 @@ { "type": "object", - "properties" : { + "required": ["id", "iid", "title", "description", "merge_params", "state", "source_branch", "target_branch", + "diff_head_sha", "create_note_path", "preview_note_path", "can_receive_suggestion", "create_issue_to_resolve_discussions_path", + "new_blob_path", "current_user", "is_project_archived"], + "properties": { "id": { "type": "integer" }, "iid": { "type": "integer" }, "title": { "type": "string" }, @@ -26,7 +29,10 @@ "can_update": { "type": "boolean" } }, "additionalProperties": false - } + }, + "is_project_archived": { "type": "boolean" }, + "locked_discussion_docs_path": { "type": "string" }, + "archived_project_docs_path": { "type": "string" } }, "additionalProperties": false } -- cgit v1.2.3