From 8f9beefac3774b30e911fb00a68f4c7a5244cf27 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 23 Mar 2020 12:09:47 +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 | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'spec/fixtures') diff --git a/spec/fixtures/api/schemas/entities/discussion.json b/spec/fixtures/api/schemas/entities/discussion.json index bcc1db79e83..16622ef6887 100644 --- a/spec/fixtures/api/schemas/entities/discussion.json +++ b/spec/fixtures/api/schemas/entities/discussion.json @@ -54,7 +54,8 @@ "cached_markdown_version": { "type": "integer" }, "human_access": { "type": ["string", "null"] }, "toggle_award_path": { "type": "string" }, - "path": { "type": "string" } + "path": { "type": "string" }, + "commands_changes": { "type": "object", "additionalProperties": true } }, "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 0f9c221fd6d..9668327adc4 100644 --- a/spec/fixtures/api/schemas/public_api/v4/notes.json +++ b/spec/fixtures/api/schemas/public_api/v4/notes.json @@ -19,6 +19,7 @@ }, "additionalProperties": false }, + "commands_changes": { "type": "object", "additionalProperties": true }, "created_at": { "type": "date" }, "updated_at": { "type": "date" }, "system": { "type": "boolean" }, -- cgit v1.2.3