Allow user choice of merge options at the time of merging

Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.

• Close this issue

Problem to solve

Current settings affect all MRs in the project and users expressed there are times they want merge commits (feature branches) and times they do not (small bug fixes.)

Proposed solution

Allow users choice of merge options at the time of merging

Acceptance criteria:

• Update the merge method section replacing radios with checkboxes
• Update the merge method description to indicate optional settings.
• Update the squash commits section
  • Update description
  • Replace the radio options with a dropdown
  • Update option descriptions
• Update the merge request widget to accommodate options

Merge requests settings

Squash commits when merging

• Dropdown options for squash commit

Merge request widget configurations:

• Merge method options
  • Merge commit
  • Merge commit with semi-linear history
  • Fast-forward merge
  • Squash merge
• Only options selected in the Merge method settings should be shown in the dropdown
• If only one option is selected in the Merge method settings, hide the Merge method section within the merge request widget
• When Squash merge is selected, hide the option to squash commits
• Scenarios 3, 4, 5, and 6 would trigger the rebase flow if the source branch is not up to date.

Scenarios:

Number	Configuration	Example result
1	Merge commit, Squash commits: off
2	Merge commit, Squash commits: on
3	Merge commit with semi-linear history, Squash commits: off
4	Merge commit with semi-linear history, Squash commits: on
5	Fast-forward merge, Squash commits: off
6	Fast-forward merge, Squash commits: on
7	Squash merge, Squash commits: disabled (hidden)