Skip to content

Allow merge when no pipeline success

What does this MR do?

  • Use BE mergeable? to determine whether we can truly merge instead of trying to figure it out on the FE.

GitLab CI pipeline

Pipeline Status Only allow merge requests to be merged if the pipeline succeeds Before After https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14200 After
No CI true
No CI w/ conflicts true
'running' true
'failed' true
'success' true
'skipped' true
No CI false
No CI w/ conflicts false
'running' false
'failed' false
'success' false
'skipped' false

External integration/service

Pipeline Status Only allow merge requests to be merged if the pipeline succeeds Before After https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14200 After
'failed' true
'canceled' true
'running' true
'pending' true
'success' true
'success_with_warnings' true
'skipped' true
'not_found' true
--- --- ---
'failed' false
'canceled' false
'running' false
'pending' false
'success' false
'success_with_warnings' false
'skipped' false
'not_found' false

Are there points in the code the reviewer needs to double check?

  • Should we rename and possibly combine the canBeMerged(checks strictly whether commits merge cleanly into repo, no CI, etc) and canMerge(used for conflict checks) in the MR widget store?
    • Is it okay if we push to another technical debt MR to keep this regression fix clean?

Why was this MR needed?

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Closes #38389 (closed)

Edited by Dimitrie Hoekstra

Merge request reports

Loading