summaryrefslogtreecommitdiff
path: root/spec/fixtures/api
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-30 12:09:15 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-30 12:09:15 +0000
commitb0bfadd4860ccd031b8814df8463f794faa9a57c (patch)
tree95d51809a0fd3cd1cb518afe7c39a90c81cea7a3 /spec/fixtures/api
parent916ae24336fa8f3e2b5d005760bb85d2e0fc2428 (diff)
downloadgitlab-ce-b0bfadd4860ccd031b8814df8463f794faa9a57c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures/api')
-rw-r--r--spec/fixtures/api/schemas/public_api/v4/label_basic.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/label_basic.json b/spec/fixtures/api/schemas/public_api/v4/label_basic.json
index 37bbdcb14fe..a501bc2ec56 100644
--- a/spec/fixtures/api/schemas/public_api/v4/label_basic.json
+++ b/spec/fixtures/api/schemas/public_api/v4/label_basic.json
@@ -5,6 +5,7 @@
"name",
"color",
"description",
+ "description_html",
"text_color"
],
"properties": {
@@ -15,6 +16,7 @@
"pattern": "^#[0-9A-Fa-f]{3}{1,2}$"
},
"description": { "type": ["string", "null"] },
+ "description_html": { "type": ["string", "null"] },
"text_color": {
"type": "string",
"pattern": "^#[0-9A-Fa-f]{3}{1,2}$"