Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

1 files changed, 8 insertions, 7 deletions

diff --git a/app/views/shared/_new_merge_request_checkbox.html.haml b/app/views/shared/_new_merge_request_checkbox.html.haml
index 6bc6d0943c9..fb3dfba2691 100644
--- a/app/views/shared/_new_merge_request_checkbox.html.haml
+++ b/app/views/shared/_new_merge_request_checkbox.html.haml
@@ -1,8 +1,9 @@
-.form-check.gl-mt-3
+.form-group.gl-mt-3
   - nonce = SecureRandom.hex
-  = check_box_tag 'create_merge_request', 1, true, class: 'js-create-merge-request form-check-input', id: "create_merge_request-#{nonce}"
-  = label_tag "create_merge_request-#{nonce}", class: 'form-check-label' do
-    - translation_variables = { new_merge_request: "<strong>#{_('new merge request')}</strong>" }
-    - translation = _('Start a %{new_merge_request} with these changes') % translation_variables
-    #{ translation.html_safe }
-
+  = render Pajamas::CheckboxTagComponent.new(name: 'create_merge_request',
+    checked: true,
+    checkbox_options: { class: 'js-create-merge-request', id: "create_merge_request-#{nonce}" }) do |c|
+    - c.with_label do
+      - translation_variables = { new_merge_request: "<strong>#{_('new merge request')}</strong>" }
+      - translation = _('Start a %{new_merge_request} with these changes') % translation_variables
+      #{ translation.html_safe }