WIP: Introduce allow merge before pipeline(s) complete setting
requested to merge pb-allow-merge-before-pipelines-complete-ui into 320981-project-setting-to-disable-merge-immediately-when-merge-trains-is-enabled
What does this MR do?
Adds a new merge options setting Allow merge before pipeline(s) complete that allows users to disable the ability to merge immediately before a pipeline has completed. The default value of the checkbox is true which holds existing functionality already in place.
View at: Project Settings > General > Merge requests (expanded) > Merge options (section)
Related to: #320981 (closed)
Screenshots (strongly suggested)
Setting
| before | after |
|---|---|
 |
 |
Ready to merge
| enabled | disabled |
|---|---|
 |
cell |
| cell | cell |
Does this MR meet the acceptance criteria?
Conformity
-
Changelog entry -
Documentation (if required) -
Code review guidelines -
Merge request performance guidelines -
Style guides -
Database guides -
Separation of EE specific content
Availability and Testing
-
Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process. -
Tested in all supported browsers -
Informed Infrastructure department of a default or new setting change, if applicable per definition of done
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 Payton Burdette