Skip to content

Add setting to allow merge on skipped pipeline

Mathieu Parent requested to merge sathieu/gitlab:allow_skipped into master

What does this MR do?

Since #30059 (closed) (!18838 (merged)), it is no longer possible to merge with skipped pipelines.

This MR adds a setting to allow this (like previous Gitlab versions).

Fixes: #211482 (closed)

Screenshots

Comment a. Settings > General b. Pipeline passed 💚 c. Pipeline failed 🔴 d. Pipeline skipped
1. All disabled Screenshot_2020-05-28_General___Settings___Administrator_allow_skipped_4_ Screenshot_2020-05-28_Update_README___1____Merge_Requests___Administrator_allow_skipped_9_ Screenshot_2020-05-28_Update_README___1____Merge_Requests___Administrator_allow_skipped_6_ Screenshot_2020-05-28_Update_README___1____Merge_Requests___Administrator_allow_skipped_10_
2. Pipelines must succeed Screenshot_2020-06-05_General___Settings___Administrator_allow_skipped_1_ Screenshot_2020-05-28_Update_README___1____Merge_Requests___Administrator_allow_skipped_9_ Screenshot_2020-05-28_Update_README___1____Merge_Requests___Administrator_allow_skipped_7_ Screenshot_2020-05-28_Update_README___1____Merge_Requests___Administrator_allow_skipped_11_
3. Pipelines must succeed + Skipped pipelines are allowed Screenshot_2020-06-05_General___Settings___Administrator_allow_skipped Screenshot_2020-05-28_Update_README___1____Merge_Requests___Administrator_allow_skipped_9_ Screenshot_2020-05-28_Update_README___1____Merge_Requests___Administrator_allow_skipped_8_ Screenshot_2020-05-28_Update_README___1____Merge_Requests___Administrator_allow_skipped_12_

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • [-] Label as security and @ mention @gitlab-com/gl-security/appsec
  • [-] The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • [-] Security reports checked/validated by a reviewer from the AppSec team
Edited by 🤖 GitLab Bot 🤖

Merge request reports