From 6a5b2fe8943190cff40e6e2c5dbc629fa4540151 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Mon, 2 Oct 2017 11:11:18 -0500 Subject: Allow merge when no pipeline success Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38389 --- spec/fixtures/api/schemas/entities/merge_request.json | 1 + 1 file changed, 1 insertion(+) (limited to 'spec/fixtures') 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" }, -- cgit v1.2.1