diff options
Diffstat (limited to 'app/views/shared/issuable/form/_merge_params.html.haml')
-rw-r--r-- | app/views/shared/issuable/form/_merge_params.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/shared/issuable/form/_merge_params.html.haml b/app/views/shared/issuable/form/_merge_params.html.haml index 5831460d59a..09086d3aa82 100644 --- a/app/views/shared/issuable/form/_merge_params.html.haml +++ b/app/views/shared/issuable/form/_merge_params.html.haml @@ -11,9 +11,9 @@ - if issuable.can_remove_source_branch?(current_user) .form-check.gl-mb-3 = hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil - = check_box_tag 'merge_request[force_remove_source_branch]', '1', issuable.force_remove_source_branch?, class: 'form-check-input' + = check_box_tag 'merge_request[force_remove_source_branch]', '1', issuable.force_remove_source_branch?, class: 'form-check-input js-form-update' = label_tag 'merge_request[force_remove_source_branch]', class: 'form-check-label' do - Delete source branch when merge request is accepted. + = _("Delete source branch when merge request is accepted.") - if !project.squash_never? .form-check - if project.squash_always? @@ -21,9 +21,9 @@ = check_box_tag 'merge_request[squash]', '1', project.squash_enabled_by_default?, class: 'form-check-input', disabled: 'true' - else = hidden_field_tag 'merge_request[squash]', '0', id: nil - = check_box_tag 'merge_request[squash]', '1', issuable_squash_option?(issuable, project), class: 'form-check-input' + = check_box_tag 'merge_request[squash]', '1', issuable_squash_option?(issuable, project), class: 'form-check-input js-form-update' = label_tag 'merge_request[squash]', class: 'form-check-label' do - Squash commits when merge request is accepted. + = _("Squash commits when merge request is accepted.") = link_to sprite_icon('question-o'), help_page_path('user/project/merge_requests/squash_and_merge'), target: '_blank', rel: 'noopener noreferrer' - if project.squash_always? .gl-text-gray-400 |