summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-08-21 12:52:34 +0000
committerRémy Coutable <remy@rymai.me>2019-08-21 12:52:34 +0000
commit96b03792190a1679b99c0918d09b76b1c2e44dc7 (patch)
treed5b052ac8fcd80182d844f426caf3222e545a27e /spec/fixtures
parentd9f9904c60b1fee162d22ece4b8875fafd04b7e6 (diff)
parente4c44b089b58d010fe8e05dbc76acbc68720ae43 (diff)
downloadgitlab-ce-96b03792190a1679b99c0918d09b76b1c2e44dc7.tar.gz
Merge branch 'ce-22058-improve-ux-multi-assignees-in-mr' into 'master'
Improve UX multi assigness in MR See merge request gitlab-org/gitlab-ce!31545
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/entities/merge_request_sidebar.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request_sidebar.json b/spec/fixtures/api/schemas/entities/merge_request_sidebar.json
index 214b67a9a0f..9945de8a856 100644
--- a/spec/fixtures/api/schemas/entities/merge_request_sidebar.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_sidebar.json
@@ -2,6 +2,7 @@
"type": "object",
"properties" : {
"id": { "type": "integer" },
+ "iid": { "type": "integer" },
"type": { "type": "string" },
"author_id": { "type": "integer" },
"project_id": { "type": "integer" },