Commit 30988aec authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'ignore-merge-when-merge-pipelines-is-stale-ce' into 'master'

Backport: Ignore merge if the status of the merge request pipeline is stale

See merge request gitlab-org/gitlab-ce!26975
parents c0f223de 1c8e99be
......@@ -1361,7 +1361,12 @@ describe API::MergeRequests do
end
it 'returns 405 if the build failed for a merge request that requires success' do
allow_any_instance_of(MergeRequest).to receive(:mergeable_ci_state?).and_return(false)
project.update!(only_allow_merge_if_pipeline_succeeds: true)
create(:ci_pipeline,
:failed,
sha: merge_request.diff_head_sha,
merge_requests_as_head_pipeline: [merge_request])
put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment