summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-04-05 10:28:19 +0000
committerSean McGivern <sean@gitlab.com>2019-04-05 10:28:19 +0000
commit934dabaf6da42db7197e07dc95cf88d34e847306 (patch)
tree537ca94aeaf22d8ddb411582b3f66c0cd9c6fad2 /spec/fixtures
parent39eb16aab2dbac3347f61f83fb60f5448d44e965 (diff)
parentea3831986b63b2e070d9b61c8e307488822acf28 (diff)
downloadgitlab-ce-934dabaf6da42db7197e07dc95cf88d34e847306.tar.gz
Merge branch 'keyval-labels' into 'master'
[CE] Add mutually exclusive labels See merge request gitlab-org/gitlab-ce!26804
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/entities/merge_request_sidebar.json3
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request_sidebar.json b/spec/fixtures/api/schemas/entities/merge_request_sidebar.json
index 7e9e048a9fd..214b67a9a0f 100644
--- a/spec/fixtures/api/schemas/entities/merge_request_sidebar.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_sidebar.json
@@ -51,6 +51,5 @@
"toggle_subscription_path": { "type": "string" },
"move_issue_path": { "type": "string" },
"projects_autocomplete_path": { "type": "string" }
- },
- "additionalProperties": false
+ }
}