summaryrefslogtreecommitdiff
path: root/spec/fixtures/api/schemas/entities
diff options
context:
space:
mode:
authorNathan Friend <nathan@gitlab.com>2019-04-15 10:25:48 -0300
committerNathan Friend <nathan@gitlab.com>2019-04-15 10:25:48 -0300
commit12170f8320c3bbe5b6bbdbda83ac7a163826b34a (patch)
treeb541b90a01ce8062ce5e0edd8da49e5ced6e7346 /spec/fixtures/api/schemas/entities
parentb99b6bb0960f749e1ba9a129be9c0365e306ed96 (diff)
downloadgitlab-ce-12170f8320c3bbe5b6bbdbda83ac7a163826b34a.tar.gz
Add two warning messages to the MR widgetnfriend-update-merge-request-widget-for-post-merge-pipelines
This commit adds two new warning messages to the MR widget that handle cases involving merge request pipelines.
Diffstat (limited to 'spec/fixtures/api/schemas/entities')
-rw-r--r--spec/fixtures/api/schemas/entities/merge_request_widget.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request_widget.json b/spec/fixtures/api/schemas/entities/merge_request_widget.json
index 6b1cd60c25d..7018cb9a305 100644
--- a/spec/fixtures/api/schemas/entities/merge_request_widget.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json
@@ -125,6 +125,7 @@
"test_reports_path": { "type": ["string", "null"] },
"can_receive_suggestion": { "type": "boolean" },
"source_branch_protected": { "type": "boolean" },
- "conflicts_docs_path": { "type": ["string", "null"] }
+ "conflicts_docs_path": { "type": ["string", "null"] },
+ "merge_request_pipelines_docs_path": { "type": ["string", "null"] }
}
}