Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

2 files changed, 9 insertions, 17 deletions

diff --git a/app/views/shared/runners/_form.html.haml b/app/views/shared/runners/_form.html.haml
index 8d0069a7664..024b06fe97a 100644
--- a/app/views/shared/runners/_form.html.haml
+++ b/app/views/shared/runners/_form.html.haml
@@ -1,30 +1,22 @@
-= form_for runner, url: runner_form_url do |f|
+= gitlab_ui_form_for runner, url: runner_form_url do |f|
   = form_errors(runner)
   .form-group.row
     = label :active, _("Active"), class: 'col-form-label col-sm-2'
     .col-sm-10
-      .form-check
-        = f.check_box :active, { class: 'form-check-input' }
-        %label.light{ for: :runner_active }= _("Paused runners don't accept new jobs")
+      = f.gitlab_ui_checkbox_component :active, _("Paused runners don't accept new jobs")
   .form-group.row
     = label :protected, _("Protected"), class: 'col-form-label col-sm-2'
     .col-sm-10
-      .form-check
-        = f.check_box :access_level, { class: 'form-check-input' }, 'ref_protected', 'not_protected'
-        %label.light{ for: :runner_access_level }= _('This runner will only run on pipelines triggered on protected branches')
+      = f.gitlab_ui_checkbox_component :access_level, _('This runner will only run on pipelines triggered on protected branches'), checked_value: 'ref_protected', unchecked_value: 'not_protected'
   .form-group.row
     = label :run_untagged, _('Run untagged jobs'), class: 'col-form-label col-sm-2'
     .col-sm-10
-      .form-check
-        = f.check_box :run_untagged, { class: 'form-check-input' }
-        %label.light{ for: :runner_run_untagged }= _('Indicates whether this runner can pick jobs without tags')
+      = f.gitlab_ui_checkbox_component :run_untagged, _('Indicates whether this runner can pick jobs without tags')
   - unless runner.group_type?
     .form-group.row
       = label :locked, _('Lock to current projects'), class: 'col-form-label col-sm-2'
       .col-sm-10
-        .form-check
-          = f.check_box :locked, { class: 'form-check-input' }
-          %label.light{ for: :runner_locked }= _('When a runner is locked, it cannot be assigned to other projects')
+        = f.gitlab_ui_checkbox_component :locked, _('When a runner is locked, it cannot be assigned to other projects')
   .form-group.row
     = label_tag :ip_address, class: 'col-form-label col-sm-2' do
       = _('IP Address')
diff --git a/app/views/shared/runners/_runner_type_alert.html.haml b/app/views/shared/runners/_runner_type_alert.html.haml
index 365cee5fadc..4bf02b71109 100644
--- a/app/views/shared/runners/_runner_type_alert.html.haml
+++ b/app/views/shared/runners/_runner_type_alert.html.haml
@@ -3,14 +3,14 @@
 - if runner.group_type?
   = render Pajamas::AlertComponent.new(alert_class: alert_class,
     title: s_('Runners|This runner is available to all projects and subgroups in a group.'),
-    dismissible: false) do
-    .gl-alert-body
+    dismissible: false) do |c|
+    = c.body do
       = s_('Runners|Use Group runners when you want all projects in a group to have access to a set of runners.')
       = link_to _('Learn more.'), help_page_path('ci/runners/runners_scope', anchor: 'group-runners'), target: '_blank', rel: 'noopener noreferrer'
 - else
   = render Pajamas::AlertComponent.new(alert_class: alert_class,
     title: s_('Runners|This runner is associated with specific projects.'),
-    dismissible: false) do
-    .gl-alert-body
+    dismissible: false) do |c|
+    = c.body do
       = s_('Runners|You can set up a specific runner to be used by multiple projects but you cannot make this a shared runner.')
       = link_to _('Learn more.'), help_page_path('ci/runners/runners_scope', anchor: 'specific-runners'), target: '_blank', rel: 'noopener noreferrer'