Skip to content
GitLab
Next
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • GitLab GitLab
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 44,763
    • Issues 44,763
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • Merge requests 1,329
    • Merge requests 1,329
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • GitLab.orgGitLab.org
  • GitLabGitLab
  • Issues
  • #12267
Closed
Open
Issue created Jun 19, 2019 by Shinya Maeda@shinya.maeda💡Maintainer

Merge When Pipeline Succeeds (MWPS) cannot be chosen while Merge Trains option is enabled

Problem

Generally, in merge requests, user can choose one merge strategy from 1. "Merge When Pipeline Succeeds" 2. "Merge Immediately".

And with https://gitlab.com/gitlab-org/gitlab-ee/issues/9186, when the merge train option is enabled, user can choose one merge strategy from 1. "Add Merge Train" (or "Add To Merge Train When Pipeline Succeeds") 2. "Merge Immediately". This effectively hides the "Merge When Pipeline Succeeds" option, however, users might still want to use this functionality as well as they need "Merge Immediately" option.

Proposal

When Merge train option is enabled, show three merge strategies:

  1. "Add Merge Train" (or "Add To Merge Train When Pipeline Succeeds")
  2. "Merge When Pipeline Succeeds"
  3. "Merge Immediately"

When Merge train option is disabled or license is not sufficient, show two merge strategies:

  1. "Merge When Pipeline Succeeds"
  2. "Merge Immediately"
Edited Jul 01, 2019 by Rayana Verissimo
Assignee
Assign to
Time tracking