summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-10-19 22:33:34 +0100
committerPhil Hughes <me@iamphill.com>2016-10-19 22:33:34 +0100
commitfcf0a4a12d1ca17438a99c2b7bf334b82fa0e26e (patch)
tree8e109ee1d989f741fd7c1b0fd26cfdbf9a545b31 /spec/fixtures
parentcd5e83b6d6da3bddbc44334a1bcdbac287b35fb4 (diff)
parentc08435e3c25f0a7a705ed8a49b16dde176b41a40 (diff)
downloadgitlab-ce-fcf0a4a12d1ca17438a99c2b7bf334b82fa0e26e.tar.gz
Merge branch 'master' into issue-board-sidebar
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/list.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/list.json b/spec/fixtures/api/schemas/list.json
index f070fa3b254..8d94cf26ecb 100644
--- a/spec/fixtures/api/schemas/list.json
+++ b/spec/fixtures/api/schemas/list.json
@@ -13,7 +13,7 @@
"enum": ["backlog", "label", "done"]
},
"label": {
- "type": ["object"],
+ "type": ["object", "null"],
"required": [
"id",
"color",