summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-20 18:09:37 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-20 18:09:37 +0000
commit4e5a71c197c67446f64ca11fc903403d3ae52983 (patch)
treea43763cc3a0abf697b80451afcb56069aae7bcbf /spec/fixtures
parent8738992b79824278b090f08e16945affc923ff6f (diff)
downloadgitlab-ce-4e5a71c197c67446f64ca11fc903403d3ae52983.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/entities/merge_request_widget.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request_widget.json b/spec/fixtures/api/schemas/entities/merge_request_widget.json
index e2df7952d8f..c90f7af5892 100644
--- a/spec/fixtures/api/schemas/entities/merge_request_widget.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json
@@ -14,6 +14,7 @@
"merge_request_cached_widget_path": { "type": "string" },
"commit_change_content_path": { "type": "string" },
"conflicts_docs_path": { "type": ["string", "null"] },
+ "reviewing_and_managing_merge_requests_docs_path": { "type": ["string", "null"] },
"merge_request_pipelines_docs_path": { "type": ["string", "null"] },
"ci_environments_status_path": { "type": "string" },
"issues_links": {