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')
|
|
|
|
%p.text-secondary= s_('ProjectSettings|This will dictate the commit history when you merge a merge request')
|
|
|
|
.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
|
2019-04-12 14:41:31 +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
|
2019-04-12 14:41:31 +00:00
|
|
|
= s_('ProjectSettings|Every merge creates a merge commit')
|
|
|
|
%br
|
|
|
|
= s_('ProjectSettings|Fast-forward merges only')
|
|
|
|
%br
|
|
|
|
= s_('ProjectSettings|When conflicts arise 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-02-18 03:09:22 +00:00
|
|
|
= form.radio_button :merge_method, :ff, class: "js-merge-method-radio form-check-input", data: { qa_selector: 'merge_ff_radio_button' }
|
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
|
2019-04-12 14:41:31 +00:00
|
|
|
= s_('ProjectSettings|No merge commits are created')
|
|
|
|
%br
|
|
|
|
= s_('ProjectSettings|Fast-forward merges only')
|
|
|
|
%br
|
|
|
|
= s_('ProjectSettings|When conflicts arise the user is given the option to rebase')
|