diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-10-02 11:11:18 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-10-05 01:46:16 -0500 |
| commit | 6a5b2fe8943190cff40e6e2c5dbc629fa4540151 (patch) | |
| tree | 220edd683a2837209e64cfc38c8c2f1d5225f2d4 /spec/fixtures | |
| parent | 8921af39e74976e37e92c786bd957883110f6522 (diff) | |
| download | gitlab-ce-6a5b2fe8943190cff40e6e2c5dbc629fa4540151.tar.gz | |
Allow merge when no pipeline success38389-allow-merge-without-success
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38389
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request.json b/spec/fixtures/api/schemas/entities/merge_request.json index 30b4e56bc98..ba094ba1657 100644 --- a/spec/fixtures/api/schemas/entities/merge_request.json +++ b/spec/fixtures/api/schemas/entities/merge_request.json @@ -46,6 +46,7 @@ "branch_missing": { "type": "boolean" }, "has_conflicts": { "type": "boolean" }, "can_be_merged": { "type": "boolean" }, + "mergeable": { "type": "boolean" }, "project_archived": { "type": "boolean" }, "only_allow_merge_if_pipeline_succeeds": { "type": "boolean" }, "has_ci": { "type": "boolean" }, |