Fast-forward merge when build succeeds + semi-linear history rebasing and merge commits.
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:
(The "Rebase button" option used to only be available when "Only fast-forward merges" is checked)
New: