diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-14 03:08:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-14 03:08:27 +0300 |
| commit | b7d58ff8b17623f64ac7835a590e79d916e758ac (patch) | |
| tree | 4f75a8f9e0e30cf8c7e944ea2c4461be396c0d5f /spec/fixtures/api | |
| parent | 0e2fc1701bd0c87cc458cbbb34c618b0e0dc5a14 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures/api')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_noteable.json | 10 |
1 files changed, 8 insertions, 2 deletions
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 } |