2018-05-31 08:44:32 +00:00
|
|
|
- form = local_assigns.fetch(:form)
|
|
|
|
|
|
|
|
.form-group
|
2019-04-12 14:41:31 +00:00
|
|
|
%b= s_('ProjectSettings|Merge method')
|
2022-02-07 12:12:27 +00:00
|
|
|
%p.text-secondary
|
|
|
|
= s_('ProjectSettings|Determine what happens to the commit history when you merge a merge request.')
|
|
|
|
= link_to s_('ProjectSettings|Learn about commit history.'), help_page_path('user/project/merge_requests/commits.md'), target: '_blank', rel: 'noopener noreferrer'
|
2019-04-12 14:41:31 +00:00
|
|
|
.form-check.mb-2
|
2018-05-31 19:20:46 +00:00
|
|
|
= form.radio_button :merge_method, :merge, class: "js-merge-method-radio form-check-input"
|
|
|
|
= label_tag :project_merge_method_merge, class: 'form-check-label' do
|
2019-04-12 14:41:31 +00:00
|
|
|
= s_('ProjectSettings|Merge commit')
|
2019-08-28 07:16:29 +00:00
|
|
|
.text-secondary
|
2021-03-12 09:09:06 +00:00
|
|
|
= s_('ProjectSettings|Every merge creates a merge commit.')
|
2018-05-31 08:44:32 +00:00
|
|
|
|
2019-04-12 14:41:31 +00:00
|
|
|
.form-check.mb-2
|
|
|
|
= form.radio_button :merge_method, :rebase_merge, class: "js-merge-method-radio form-check-input"
|
|
|
|
= label_tag :project_merge_method_rebase_merge, class: 'form-check-label' do
|
|
|
|
= s_('ProjectSettings|Merge commit with semi-linear history')
|
2019-08-28 07:16:29 +00:00
|
|
|
.text-secondary
|
2021-03-12 09:09:06 +00:00
|
|
|
= s_('ProjectSettings|Every merge creates a merge commit.')
|
2019-04-12 14:41:31 +00:00
|
|
|
%br
|
2022-03-09 03:09:18 +00:00
|
|
|
= s_('ProjectSettings|Merging is only allowed when the source branch is up-to-date with its target.')
|
2019-04-12 14:41:31 +00:00
|
|
|
%br
|
2022-03-09 03:09:18 +00:00
|
|
|
= s_('ProjectSettings|When semi-linear merge is not possible, the user is given the option to rebase.')
|
2018-05-31 08:44:32 +00:00
|
|
|
|
2019-04-12 14:41:31 +00:00
|
|
|
.form-check.mb-2
|
2021-04-23 21:09:46 +00:00
|
|
|
= form.radio_button :merge_method, :ff, class: "js-merge-method-radio form-check-input", data: { qa_selector: 'merge_ff_radio' }
|
2019-04-12 14:41:31 +00:00
|
|
|
= label_tag :project_merge_method_ff, class: 'form-check-label' do
|
|
|
|
= s_('ProjectSettings|Fast-forward merge')
|
2019-08-28 07:16:29 +00:00
|
|
|
.text-secondary
|
2021-03-12 09:09:06 +00:00
|
|
|
= s_('ProjectSettings|No merge commits are created.')
|
2019-04-12 14:41:31 +00:00
|
|
|
%br
|
2021-03-12 09:09:06 +00:00
|
|
|
= s_('ProjectSettings|Fast-forward merges only.')
|
2019-04-12 14:41:31 +00:00
|
|
|
%br
|
2021-03-12 09:09:06 +00:00
|
|
|
= s_('ProjectSettings|When there is a merge conflict, the user is given the option to rebase.')
|
2022-01-12 21:13:49 +00:00
|
|
|
%div
|
|
|
|
= s_('ProjectSettings|If merge trains are enabled, merging is only possible if the branch can be rebased without conflicts.')
|
2022-02-07 12:12:27 +00:00
|
|
|
= link_to s_('ProjectSettings|What are merge trains?'), help_page_path('ci/pipelines/merge_trains.md', anchor: 'enable-merge-trains'), target: '_blank', rel: 'noopener noreferrer'
|