3 files changed, 15 insertions, 21 deletions
diff --git a/app/views/admin/hooks/_form.html.haml b/app/views/admin/hooks/_form.html.haml
index bd63172a0ee..a309e874317 100644
--- a/app/views/admin/hooks/_form.html.haml
+++ b/app/views/admin/hooks/_form.html.haml
@@ -11,24 +11,18 @@
 .form-group
   = form.label :url, _('Trigger'), class: 'label-bold'
   .form-text.text-secondary.gl-mb-5= _('System hooks are triggered on sets of events like creating a project or adding an SSH key. You can also enable extra triggers, such as push events.')
-  %fieldset.form-group.form-check
-    = form.check_box :repository_update_events, class: 'form-check-input'
-    = form.label :repository_update_events, _('Repository update events'), class: 'label-bold form-check-label'
-    .text-secondary= _('URL is triggered when repository is updated')
-  %fieldset.form-group.form-check
-    = form.check_box :push_events, class: 'form-check-input'
-    = form.label :push_events, _('Push events'), class: 'label-bold form-check-label'
-    .text-secondary= _('URL is triggered for each branch updated to the repository')
-  %fieldset.form-group.form-check
-    = form.check_box :tag_push_events, class: 'form-check-input'
-    = form.label :tag_push_events, _('Tag push events'), class: 'label-bold form-check-label'
-    .text-secondary= _('URL is triggered when a new tag is pushed to the repository')
-  %fieldset.form-group.form-check
-    = form.check_box :merge_requests_events, class: 'form-check-input'
-    = form.label :merge_requests_events, _('Merge request events'), class: 'label-bold form-check-label'
-    .text-secondary= _('URL is triggered when a merge request is created, updated, or merged')
+  %fieldset.form-group
+    = form.gitlab_ui_checkbox_component :repository_update_events, _('Repository update events'),
+    help_text: _('URL is triggered when repository is updated')
+  %fieldset.form-group
+    = form.gitlab_ui_checkbox_component :push_events, _('Push events'),
+    help_text: _('URL is triggered for each branch updated to the repository')
+  %fieldset.form-group
+    = form.gitlab_ui_checkbox_component :tag_push_events, _('Tag push events'),
+    help_text: _('URL is triggered when a new tag is pushed to the repository')
+  %fieldset.form-group
+    = form.gitlab_ui_checkbox_component :merge_requests_events, _('Merge request events'),
+    help_text: _('URL is triggered when a merge request is created, updated, or merged')
 .form-group
   = form.label :enable_ssl_verification, _('SSL verification'), class: 'label-bold checkbox'
-  .form-check
-    = form.check_box :enable_ssl_verification, class: 'form-check-input'
-    = form.label :enable_ssl_verification, _('Enable SSL verification'), class: 'label-bold form-check-label'
+  = form.gitlab_ui_checkbox_component :enable_ssl_verification, _('Enable SSL verification')
diff --git a/app/views/admin/hooks/edit.html.haml b/app/views/admin/hooks/edit.html.haml
index 566d8a99ac6..e8176e9f8bb 100644
--- a/app/views/admin/hooks/edit.html.haml
+++ b/app/views/admin/hooks/edit.html.haml
@@ -8,7 +8,7 @@
     = render 'shared/web_hooks/title_and_docs', hook: @hook
 
   .col-lg-9.gl-mb-3
-    = form_for @hook, as: :hook, url: admin_hook_path do |f|
+    = gitlab_ui_form_for @hook, as: :hook, url: admin_hook_path do |f|
       = render partial: 'form', locals: { form: f, hook: @hook }
       .form-actions
         %span>= f.submit _('Save changes'), class: 'btn gl-button btn-confirm gl-mr-3'
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index 3e2cd126e1a..f23d77c8da5 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -5,7 +5,7 @@
     = render 'shared/web_hooks/title_and_docs', hook: @hook
 
   .col-lg-8.gl-mb-3
-    = form_for @hook, as: :hook, url: admin_hooks_path do |f|
+    = gitlab_ui_form_for @hook, as: :hook, url: admin_hooks_path do |f|
       = render partial: 'form', locals: { form: f, hook: @hook }
       = f.submit _('Add system hook'), class: 'btn gl-button btn-confirm'