Merge branch '358360-use-pajamas-checkbox-group-owners-can-manage-default-branch' into 'master'

Use pajamas checkbox for group owners can manage default branch checkbox See merge request gitlab-org/gitlab!84851

Merge branch '358360-use-pajamas-checkbox-group-owners-can-manage-default-branch' into 'master'
Use pajamas checkbox for group owners can manage default branch checkbox See merge request gitlab-org/gitlab!84851
aaa50b96 · Simon Knox · 788946bf · 54b70fdc · aaa50b96
Commit aaa50b96 authored Apr 19, 2022 by Simon Knox
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

ee/app/views/admin/application_settings/_group_owners_can_manage_default_branch_protection_setting.html.haml ...rs_can_manage_default_branch_protection_setting.html.haml +4 -6

No files found.
--- a/ee/app/views/admin/application_settings/_group_owners_can_manage_default_branch_protection_setting.html.haml
+++ b/ee/app/views/admin/application_settings/_group_owners_can_manage_default_branch_protection_setting.html.haml
@@ -2,9 +2,7 @@
 - f = local_assigns.fetch(:form)
-.form-group.form-check
+.form-group
-  = f.check_box :group_owners_can_manage_default_branch_protection, class: 'form-check-input'
+  = f.gitlab_ui_checkbox_component :group_owners_can_manage_default_branch_protection,
-  = f.label :group_owners_can_manage_default_branch_protection, class: 'form-check-label' do
+    _('Allow owners to manage default branch protection per group.'),
-    = _('Allow owners to manage default branch protection per group.')
+    help_text: s_('AdminSettings|Affects all new and existing groups.')
-    .form-text.text-muted
-      = s_("AdminSettings|Affects all new and existing groups.")