Merge branch 'ff-merge-when-build-succeeds' into 'master'
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: - [x] Test - [x] More screenshots :) ## Settings Old:  (The "Rebase button" option used to only be available when "Only fast-forward merges" is checked) New:  ## Merge widget ### With "Fast-forward merge" or "Merge commit with semi-linear history", when ff merge is NOT possible  ### After "Rebase" button is clicked  ### When MR is viewed during rebasing  ### With "Fast-forward merge", when ff merge is possible  ### With "Merge commit" or "Merge commit with semi-linear history", when ff merge is possible  See merge request !110
Showing
Please register or sign in to comment