Skip to content

Allow modifying squash commit message for fast-forward only merge method

What does this MR do?

Currently there is no possibility to edit a squash commit message when Fast-forward merge and Squash commits are both enabled. This MR allows user to edit squash commit message on fast-forward merge.

Possible cases

  1. Fast-forward merge is enabled, there is only one commit in current MR. We don't show an expandable header and Squash commits checkbox, commit message is used for merging MR to target branch

Screen_Shot_2019-03-12_at_13.05.41

  1. Fast-forward merge is enabled, Squash commits checkbox is unchecked. We don't show an expandable header as all commits will to to target branch with respective commit messages

Screen_Shot_2019-03-12_at_13.06.38

  1. Fast-forward merge is enabled, Squash commits checkbox is checked. We show the collapsible header with **1 commit** will be added to master message. On expanding the header we show a field only for editing a squash commit message (because there will be no merge commit message):
Collapsed Expanded
Screen_Shot_2019-03-12_at_13.06.47 Screen_Shot_2019-03-12_at_13.06.59

What are the relevant issue numbers?

#47149 (closed)

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58631

Does this MR meet the acceptance criteria?

Closes #48324 (closed)

Edited by André Luís

Merge request reports