Namespace license checks for fast-forward merge when possible
Designs
- Show closed items
Activity
-
Newest first Oldest first
-
Show all activity Show comments only Show history only
- Author Maintainer
Use fast-forward merged where possible (EES / Bronze)
-
Do not show radio option for
fast-forward merge
on project settings page -
How to handle for future cases where this has already been set?
-
- Author Maintainer
Introduced in https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/485 by @dzaporozhets
- Douwe Maan mentioned in issue #2570 (closed)
mentioned in issue #2570 (closed)
- Douwe Maan mentioned in issue #2571 (closed)
mentioned in issue #2571 (closed)
- Author Maintainer
- Author Maintainer
@dzaporozhets How much effort do you estimate it will take to find all places that touch fast-forward merge and add
project.feature_available?(:fast_forward_merge)
checks to them (both on frontend and backend), so that this feature can be turned off for a specific project in its entirety by having that method returnfalse
?Edited by Douwe Maan - Douwe Maan mentioned in issue #2335 (closed)
mentioned in issue #2335 (closed)
- Owner
@DouweM approx 4 hours. ownership of this issue?
Edited by username-removed-444 - Author Maintainer
@dzaporozhets OK, thanks. I'll be assigning people for 9.4.
1 - Douwe Maan assigned to @nick.thomas
assigned to @nick.thomas
- Maintainer
We have to decide which merge method to use when a project has
fast_forward_merge
set, but the license does not allow it.Are we happy to use "Merge commit", or should it be "Merge commit with semi-linear history" ?
It feels like the second is closer to the suggested action than the first?
/cc @dzaporozhets
- Nick Thomas mentioned in merge request !2272 (merged)
mentioned in merge request !2272 (merged)
- Maintainer
On second thought, we should be acting as though we are CE when the feature isn't available. This means we should use the
merge
strategy. 1 - Douwe Maan closed via merge request !2272 (merged)
closed via merge request !2272 (merged)
- Douwe Maan mentioned in commit 62d05c23
mentioned in commit 62d05c23