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: ![Screen_Shot_2016-01-07_at_16.56.42](/uploads/b5a8db9d761a5442d8787ea4913f6f93/Screen_Shot_2016-01-07_at_16.56.42.png) (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](/uploads/1a000cc8bd02aa9e5b053cb52ed8c3c8/Screen_Shot_2016-01-07_at_16.57.57.png) ## 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](/uploads/e3e1ec924b9783b01054fea1446c8235/Screen_Shot_2016-01-12_at_16.21.16.png) ### After "Rebase" button is clicked ![Screen_Shot_2016-01-12_at_16.24.39](/uploads/99619afd73df5850b5620734875add05/Screen_Shot_2016-01-12_at_16.24.39.png) ### When MR is viewed during rebasing ![Screen_Shot_2016-01-12_at_16.24.42](/uploads/80b6d314880c80530810e029988dd216/Screen_Shot_2016-01-12_at_16.24.42.png) ### With "Fast-forward merge", when ff merge is possible ![Screen_Shot_2016-01-12_at_16.19.26](/uploads/0b9e3b82ace27149c9c337b09d519396/Screen_Shot_2016-01-12_at_16.19.26.png) ### With "Merge commit" or "Merge commit with semi-linear history", when ff merge is possible ![Screen_Shot_2016-01-12_at_16.20.07](/uploads/30589140b304db55bc58c2c7ae9e1c90/Screen_Shot_2016-01-12_at_16.20.07.png) See merge request !110
Showing
Please register or sign in to comment