27a75ea175
When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
13 lines
605 B
Text
13 lines
605 B
Text
- form = local_assigns.fetch(:form)
|
|
|
|
.radio
|
|
= label_tag :project_merge_method_rebase_merge do
|
|
= form.radio_button :merge_method, :rebase_merge, class: "js-merge-method-radio"
|
|
%strong Merge commit with semi-linear history
|
|
%br
|
|
%span.descr
|
|
A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible.
|
|
This way you could make sure that if this merge request would build, after merging to target branch it would also build.
|
|
%br
|
|
%span.descr
|
|
When fast-forward merge is not possible, the user is given the option to rebase.
|