diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-04-16 17:21:50 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-04-16 17:21:50 +0300 |
| commit | cd509d991ec43b05994af1c157ef724af7f04e8f (patch) | |
| tree | 811b8c65b6e825db3af4e8ca932683b10a74322c /spec/fixtures | |
| parent | 2dbbe7348b4156dea1f5229fd3e5db43ccad8834 (diff) | |
| parent | 12170f8320c3bbe5b6bbdbda83ac7a163826b34a (diff) | |
Merge branch 'nfriend-update-merge-request-widget-for-post-merge-pipelines' into 'master'
Update merge request widget to accommodate post-merge pipelines
See merge request gitlab-org/gitlab-ce!25983
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_widget.json | 3 |
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"] } } } |