From 2c72daf2f1744f2b8c8c6674c266907e9ef55558 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 30 Mar 2020 18:08:07 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/fixtures/api/schemas/entities/discussion.json | 3 ++- spec/fixtures/api/schemas/public_api/v4/notes.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'spec/fixtures') diff --git a/spec/fixtures/api/schemas/entities/discussion.json b/spec/fixtures/api/schemas/entities/discussion.json index 16622ef6887..92863d2e084 100644 --- a/spec/fixtures/api/schemas/entities/discussion.json +++ b/spec/fixtures/api/schemas/entities/discussion.json @@ -55,7 +55,8 @@ "human_access": { "type": ["string", "null"] }, "toggle_award_path": { "type": "string" }, "path": { "type": "string" }, - "commands_changes": { "type": "object", "additionalProperties": true } + "commands_changes": { "type": "object", "additionalProperties": true }, + "confidential": { "type": ["boolean", "null"] } }, "required": [ "id", "attachment", "author", "created_at", "updated_at", diff --git a/spec/fixtures/api/schemas/public_api/v4/notes.json b/spec/fixtures/api/schemas/public_api/v4/notes.json index 9668327adc4..d15d2e90b05 100644 --- a/spec/fixtures/api/schemas/public_api/v4/notes.json +++ b/spec/fixtures/api/schemas/public_api/v4/notes.json @@ -28,7 +28,8 @@ "noteable_type": { "type": "string" }, "resolved": { "type": "boolean" }, "resolvable": { "type": "boolean" }, - "resolved_by": { "type": ["string", "null"] } + "resolved_by": { "type": ["string", "null"] }, + "confidential": { "type": ["boolean", "null"] } }, "required": [ "id", "body", "attachment", "author", "created_at", "updated_at", -- cgit v1.2.3