debian-mirror-gitlab/app/views/projects/_merge_request_merge_method_settings.html.haml

34 lines
1.6 KiB
Text
Raw Normal View History

2018-11-08 19:23:39 +05:30
- form = local_assigns.fetch(:form)
.form-group
2019-07-31 22:56:46 +05:30
%b= s_('ProjectSettings|Merge method')
2021-04-17 20:07:23 +05:30
%p.text-secondary= s_('ProjectSettings|Determine what happens to the commit history when you merge a merge request.')
2019-07-31 22:56:46 +05:30
.form-check.mb-2
2018-11-08 19:23:39 +05:30
= 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-07-31 22:56:46 +05:30
= s_('ProjectSettings|Merge commit')
2019-12-04 20:38:33 +05:30
.text-secondary
2021-04-17 20:07:23 +05:30
= s_('ProjectSettings|Every merge creates a merge commit.')
2018-11-08 19:23:39 +05:30
2019-07-31 22:56:46 +05:30
.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-12-04 20:38:33 +05:30
.text-secondary
2021-04-17 20:07:23 +05:30
= s_('ProjectSettings|Every merge creates a merge commit.')
2019-07-31 22:56:46 +05:30
%br
2021-04-17 20:07:23 +05:30
= s_('ProjectSettings|Fast-forward merges only.')
2019-07-31 22:56:46 +05:30
%br
2021-04-17 20:07:23 +05:30
= s_('ProjectSettings|When there is a merge conflict, the user is given the option to rebase.')
2018-11-08 19:23:39 +05:30
2019-07-31 22:56:46 +05:30
.form-check.mb-2
2021-06-08 01:23:25 +05:30
= form.radio_button :merge_method, :ff, class: "js-merge-method-radio form-check-input", data: { qa_selector: 'merge_ff_radio' }
2019-07-31 22:56:46 +05:30
= label_tag :project_merge_method_ff, class: 'form-check-label' do
= s_('ProjectSettings|Fast-forward merge')
2019-12-04 20:38:33 +05:30
.text-secondary
2021-04-17 20:07:23 +05:30
= s_('ProjectSettings|No merge commits are created.')
2019-07-31 22:56:46 +05:30
%br
2021-04-17 20:07:23 +05:30
= s_('ProjectSettings|Fast-forward merges only.')
2019-07-31 22:56:46 +05:30
%br
2021-04-17 20:07:23 +05:30
= s_('ProjectSettings|When there is a merge conflict, the user is given the option to rebase.')