Skip to content

Fast-forward merge when build succeeds + semi-linear history rebasing and merge commits.

Douwe Maan requested to merge ff-merge-when-build-succeeds into master

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/28.

I'll backport 1d6c271e and 9292d8e6 to CE.

To do:

  • Test
  • More screenshots :)

Settings

Old:

Screen_Shot_2016-01-07_at_16.56.42

(The "Rebase button" option used to only be available when "Only fast-forward merges" is checked)

New:

Screen_Shot_2016-01-07_at_16.57.57

Merge widget

With "Fast-forward merge" or "Merge commit with semi-linear history", when ff merge is NOT possible

Screen_Shot_2016-01-12_at_16.21.16

After "Rebase" button is clicked

Screen_Shot_2016-01-12_at_16.24.39

When MR is viewed during rebasing

Screen_Shot_2016-01-12_at_16.24.42

With "Fast-forward merge", when ff merge is possible

Screen_Shot_2016-01-12_at_16.19.26

With "Merge commit" or "Merge commit with semi-linear history", when ff merge is possible

Screen_Shot_2016-01-12_at_16.20.07

Merge request reports