Skip to content

Add "Allow merge trains" option to project settings page

Nathan Friend requested to merge 9186-add-merge-train-setting into master

What does this MR do?

Adds the "Allow merge trains" options to the project settings page (in the Merge options) section) as part of https://gitlab.com/gitlab-org/gitlab-ee/issues/9186.

image

This change is hidden behind the merge_trains feature flag.

CE backport: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28006 No CE backport needed.

Does this MR meet the acceptance criteria?

Conformity

Performance 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 Nathan Friend

Merge request reports