Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

2 files changed, 31 insertions, 29 deletions

diff --git a/app/views/shared/web_hooks/_form.html.haml b/app/views/shared/web_hooks/_form.html.haml
index c5234f14090..c37a34f9be8 100644
--- a/app/views/shared/web_hooks/_form.html.haml
+++ b/app/views/shared/web_hooks/_form.html.haml
@@ -10,89 +10,91 @@
   = s_('Webhooks|Use this token to validate received payloads. It will be sent with the request in the X-Gitlab-Token HTTP header.')
 .form-group
   = form.label :url, s_('Webhooks|Trigger'), class: 'label-bold'
-  %ul.list-unstyled.prepend-left-20
+  %ul.list-unstyled.gl-ml-6
     %li
       = form.check_box :push_events, class: 'form-check-input'
-      = form.label :push_events, class: 'list-label form-check-label ml-1' do
+      = form.label :push_events, class: 'list-label form-check-label gl-ml-1' do
         %strong= s_('Webhooks|Push events')
       = form.text_field :push_events_branch_filter, class: 'form-control', placeholder: 'Branch name or wildcard pattern to trigger on (leave blank for all)'
-      %p.text-muted.ml-1
+      %p.text-muted.gl-ml-1
         = s_('Webhooks|This URL will be triggered by a push to the repository')
     %li
       = form.check_box :tag_push_events, class: 'form-check-input'
-      = form.label :tag_push_events, class: 'list-label form-check-label ml-1' do
+      = form.label :tag_push_events, class: 'list-label form-check-label gl-ml-1' do
         %strong= s_('Webhooks|Tag push events')
-      %p.text-muted.ml-1
+      %p.text-muted.gl-ml-1
         = s_('Webhooks|This URL will be triggered when a new tag is pushed to the repository')
     %li
       = form.check_box :note_events, class: 'form-check-input'
-      = form.label :note_events, class: 'list-label form-check-label ml-1' do
+      = form.label :note_events, class: 'list-label form-check-label gl-ml-1' do
         %strong= s_('Webhooks|Comments')
-      %p.text-muted.ml-1
+      %p.text-muted.gl-ml-1
         = s_('Webhooks|This URL will be triggered when someone adds a comment')
     %li
       = form.check_box :confidential_note_events, class: 'form-check-input'
-      = form.label :confidential_note_events, class: 'list-label form-check-label ml-1' do
+      = form.label :confidential_note_events, class: 'list-label form-check-label gl-ml-1' do
         %strong= s_('Webhooks|Confidential Comments')
-      %p.text-muted.ml-1
+      %p.text-muted.gl-ml-1
         = s_('Webhooks|This URL will be triggered when someone adds a comment on a confidential issue')
     %li
       = form.check_box :issues_events, class: 'form-check-input'
-      = form.label :issues_events, class: 'list-label form-check-label ml-1' do
+      = form.label :issues_events, class: 'list-label form-check-label gl-ml-1' do
         %strong= s_('Webhooks|Issues events')
-      %p.text-muted.ml-1
+      %p.text-muted.gl-ml-1
         = s_('Webhooks|This URL will be triggered when an issue is created/updated/merged')
     %li
       = form.check_box :confidential_issues_events, class: 'form-check-input'
-      = form.label :confidential_issues_events, class: 'list-label form-check-label ml-1' do
+      = form.label :confidential_issues_events, class: 'list-label form-check-label gl-ml-1' do
         %strong= s_('Webhooks|Confidential Issues events')
-      %p.text-muted.ml-1
+      %p.text-muted.gl-ml-1
         = s_('Webhooks|This URL will be triggered when a confidential issue is created/updated/merged')
+    - if @group
+      = render_if_exists 'groups/hooks/member_events', form: form
     %li
       = form.check_box :merge_requests_events, class: 'form-check-input'
-      = form.label :merge_requests_events, class: 'list-label form-check-label ml-1' do
+      = form.label :merge_requests_events, class: 'list-label form-check-label gl-ml-1' do
         %strong= s_('Webhooks|Merge request events')
-      %p.text-muted.ml-1
+      %p.text-muted.gl-ml-1
         = s_('Webhooks|This URL will be triggered when a merge request is created/updated/merged')
     %li
       = form.check_box :job_events, class: 'form-check-input'
-      = form.label :job_events, class: 'list-label form-check-label ml-1' do
+      = form.label :job_events, class: 'list-label form-check-label gl-ml-1' do
         %strong= s_('Webhooks|Job events')
-      %p.text-muted.ml-1
+      %p.text-muted.gl-ml-1
         = s_('Webhooks|This URL will be triggered when the job status changes')
     %li
       = form.check_box :pipeline_events, class: 'form-check-input'
-      = form.label :pipeline_events, class: 'list-label form-check-label ml-1' do
+      = form.label :pipeline_events, class: 'list-label form-check-label gl-ml-1' do
         %strong= s_('Webhooks|Pipeline events')
-      %p.text-muted.ml-1
+      %p.text-muted.gl-ml-1
         = s_('Webhooks|This URL will be triggered when the pipeline status changes')
     %li
       = form.check_box :wiki_page_events, class: 'form-check-input'
-      = form.label :wiki_page_events, class: 'list-label form-check-label ml-1' do
+      = form.label :wiki_page_events, class: 'list-label form-check-label gl-ml-1' do
         %strong= s_('Webhooks|Wiki Page events')
-      %p.text-muted.ml-1
+      %p.text-muted.gl-ml-1
         = s_('Webhooks|This URL will be triggered when a wiki page is created/updated')
     %li
       = form.check_box :deployment_events, class: 'form-check-input'
-      = form.label :deployment_events, class: 'list-label form-check-label ml-1' do
+      = form.label :deployment_events, class: 'list-label form-check-label gl-ml-1' do
         %strong= s_('Webhooks|Deployment events')
-      %p.text-muted.ml-1
+      %p.text-muted.gl-ml-1
         = s_('Webhooks|This URL is triggered when a deployment starts, finishes, fails, or is canceled')
     %li
       = form.check_box :feature_flag_events, class: 'form-check-input'
-      = form.label :feature_flag_events, class: 'list-label form-check-label ml-1' do
+      = form.label :feature_flag_events, class: 'list-label form-check-label gl-ml-1' do
         %strong= s_('Webhooks|Feature Flag events')
-      %p.text-muted.ml-1
+      %p.text-muted.gl-ml-1
         = s_('Webhooks|This URL is triggered when a feature flag is turned on or off')
     %li
       = form.check_box :releases_events, class: 'form-check-input'
-      = form.label :releases_events, class: 'list-label form-check-label ml-1' do
+      = form.label :releases_events, class: 'list-label form-check-label gl-ml-1' do
         %strong= s_('Webhooks|Releases events')
-      %p.text-muted.ml-1
+      %p.text-muted.gl-ml-1
         = s_('Webhooks|This URL is triggered when a release is created/updated')
 .form-group
   = form.label :enable_ssl_verification, s_('Webhooks|SSL verification'), class: 'label-bold checkbox'
   .form-check
     = form.check_box :enable_ssl_verification, class: 'form-check-input'
-    = form.label :enable_ssl_verification, class: 'form-check-label ml-1' do
+    = form.label :enable_ssl_verification, class: 'form-check-label gl-ml-1' do
       %strong= s_('Webhooks|Enable SSL verification')
diff --git a/app/views/shared/web_hooks/_test_button.html.haml b/app/views/shared/web_hooks/_test_button.html.haml
index fc24e425ab6..c46b8a99886 100644
--- a/app/views/shared/web_hooks/_test_button.html.haml
+++ b/app/views/shared/web_hooks/_test_button.html.haml
@@ -5,7 +5,7 @@
 .hook-test-button.dropdown.inline>
   %button.btn{ 'data-toggle' => 'dropdown', class: button_class }
     = _('Test')
-    = icon('caret-down')
+    = sprite_icon('chevron-down')
   %ul.dropdown-menu.dropdown-menu-right{ role: 'menu' }
     - triggers.each_value do |event|
       %li