34 lines
1.5 KiB
Plaintext
34 lines
1.5 KiB
Plaintext
- form = local_assigns.fetch(:form)
|
|
|
|
.form-group
|
|
%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
|
|
= 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
|
|
= s_('ProjectSettings|Merge commit')
|
|
.text-secondary
|
|
= s_('ProjectSettings|Every merge creates a merge commit')
|
|
|
|
.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')
|
|
.text-secondary
|
|
= 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')
|
|
|
|
.form-check.mb-2
|
|
= form.radio_button :merge_method, :ff, class: "js-merge-method-radio qa-radio-button-merge-ff form-check-input"
|
|
= label_tag :project_merge_method_ff, class: 'form-check-label' do
|
|
= s_('ProjectSettings|Fast-forward merge')
|
|
.text-secondary
|
|
= 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')
|