diff options
| author | Alessio Caiazza <acaiazza@gitlab.com> | 2018-10-29 11:34:41 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-10-29 11:34:41 +0000 |
| commit | dadc046d3a5c797294330bcd26acdadac069c9cc (patch) | |
| tree | 3468d1ca9b320315f3d4d5e5e032e6d547cc2550 /spec/fixtures | |
| parent | 289651e26f5b18cc68dcdd052939cd878ca66092 (diff) | |
| download | gitlab-ce-dadc046d3a5c797294330bcd26acdadac069c9cc.tar.gz | |
post merge pipeline and environments status
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_widget.json | 1 |
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 c40977bc4ee..35971d564d5 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_widget.json +++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json @@ -46,6 +46,7 @@ "diff_head_commit_short_id": { "type": ["string", "null"] }, "merge_commit_message": { "type": ["string", "null"] }, "pipeline": { "type": ["object", "null"] }, + "merge_pipeline": { "type": ["object", "null"] }, "work_in_progress": { "type": "boolean" }, "source_branch_exists": { "type": "boolean" }, "mergeable_discussions_state": { "type": "boolean" }, |