Add latest changes from gitlab-org/gitlab@master

9 files changed, 46 insertions, 46 deletions

diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue
index 6e347a3c95b..6f7dce8f9e6 100644
--- a/app/assets/javascripts/groups/components/group_item.vue
+++ b/app/assets/javascripts/groups/components/group_item.vue
@@ -3,9 +3,9 @@ import {
   GlAvatar,
   GlLoadingIcon,
   GlBadge,
+  GlButton,
   GlIcon,
   GlLabel,
-  GlButton,
   GlPopover,
   GlLink,
   GlTooltipDirective,
@@ -27,7 +27,6 @@ import { ITEM_TYPE, ACTIVE_TAB_SHARED } from '../constants';
 import eventHub from '../event_hub';
 
 import ItemActions from './item_actions.vue';
-import ItemCaret from './item_caret.vue';
 import ItemStats from './item_stats.vue';
 import ItemTypeIcon from './item_type_icon.vue';
 
@@ -39,14 +38,13 @@ export default {
   components: {
     GlAvatar,
     GlBadge,
+    GlButton,
     GlLoadingIcon,
     GlIcon,
     GlLabel,
-    GlButton,
     GlPopover,
     GlLink,
     UserAccessRoleBadge,
-    ItemCaret,
     ItemTypeIcon,
     ItemActions,
     ItemStats,
@@ -125,6 +123,12 @@ export default {
           VISIBILITY_LEVELS_STRING_TO_INTEGER[this.currentGroupVisibility]
       );
     },
+    toggleAriaLabel() {
+      return this.group.isOpen ? this.$options.i18n.collapse : this.$options.i18n.expand;
+    },
+    toggleIconName() {
+      return this.group.isOpen ? 'chevron-down' : 'chevron-right';
+    },
   },
   methods: {
     onClickRowGroup(e) {
@@ -142,6 +146,8 @@ export default {
     },
   },
   i18n: {
+    expand: __('Expand'),
+    collapse: __('Collapse'),
     popoverTitle: __('Less restrictive visibility'),
     popoverBody: __('Project visibility level is less restrictive than the group settings.'),
     learnMore: __('Learn more'),
@@ -173,7 +179,16 @@ export default {
       class="group-row-contents d-flex align-items-center py-2 pr-3"
     >
       <div class="folder-toggle-wrap gl-mr-2 d-flex align-items-center">
-        <item-caret :is-group-open="group.isOpen" />
+        <gl-button
+          v-if="hasChildren"
+          :aria-label="toggleAriaLabel"
+          :aria-expanded="String(group.isOpen)"
+          category="tertiary"
+          data-testid="group-item-toggle-button"
+          :icon="toggleIconName"
+          @click.stop="onClickRowGroup"
+        />
+        <div v-else class="gl-h-7 gl-w-7"></div>
         <item-type-icon :item-type="group.type" />
       </div>
       <gl-loading-icon
@@ -215,7 +230,7 @@ export default {
               {{ group.name }}
             </a>
             <gl-icon
-              v-gl-tooltip.hover.bottom
+              v-gl-tooltip.bottom
               class="gl-display-inline-flex gl-align-items-center gl-mr-3 gl-text-gray-500"
               :name="visibilityIcon"
               :title="visibilityTooltip"
diff --git a/app/assets/javascripts/groups/components/item_caret.vue b/app/assets/javascripts/groups/components/item_caret.vue
deleted file mode 100644
index ef82e6d693a..00000000000
--- a/app/assets/javascripts/groups/components/item_caret.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<script>
-import { GlIcon } from '@gitlab/ui';
-
-export default {
-  components: {
-    GlIcon,
-  },
-  props: {
-    isGroupOpen: {
-      type: Boolean,
-      required: true,
-      default: false,
-    },
-  },
-  computed: {
-    iconClass() {
-      return this.isGroupOpen ? 'chevron-down' : 'chevron-right';
-    },
-  },
-};
-</script>
-
-<template>
-  <span class="folder-caret gl-display-inline-block gl-text-secondary gl-w-5 gl-mr-2">
-    <gl-icon :size="12" :name="iconClass" />
-  </span>
-</template>
diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss
index 91f123d7b26..1b51c7f6ba9 100644
--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
@@ -123,12 +123,6 @@ table.pipeline-project-metrics tr td {
     width: 20px;
   }
 
-  > .group-row:not(.has-children) {
-    .folder-caret {
-      opacity: 0;
-    }
-  }
-
   .group-list-tree {
     margin-bottom: 0;
     margin-left: 30px;
diff --git a/app/controllers/admin/hooks_controller.rb b/app/controllers/admin/hooks_controller.rb
index c6c0e7eac90..589dd9b324d 100644
--- a/app/controllers/admin/hooks_controller.rb
+++ b/app/controllers/admin/hooks_controller.rb
@@ -24,7 +24,7 @@ class Admin::HooksController < Admin::ApplicationController
   end
 
   def hook_param_names
-    %i[enable_ssl_verification token url]
+    %i[enable_ssl_verification name description token url]
   end
 
   def trigger_values
diff --git a/app/controllers/concerns/web_hooks/hook_actions.rb b/app/controllers/concerns/web_hooks/hook_actions.rb
index 076347922c8..5aeb10dfb87 100644
--- a/app/controllers/concerns/web_hooks/hook_actions.rb
+++ b/app/controllers/concerns/web_hooks/hook_actions.rb
@@ -71,7 +71,7 @@ module WebHooks
     end
 
     def hook_param_names
-      %i[enable_ssl_verification token url push_events_branch_filter branch_filter_strategy]
+      %i[enable_ssl_verification name description token url push_events_branch_filter branch_filter_strategy]
     end
 
     def destroy_hook(hook)
diff --git a/app/models/ai/service_access_token.rb b/app/models/cloud_connector/service_access_token.rb
index d2d64079c74..e026b10ec0c 100644
--- a/app/models/ai/service_access_token.rb
+++ b/app/models/cloud_connector/service_access_token.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Ai
+module CloudConnector
   class ServiceAccessToken < ApplicationRecord
     self.table_name = 'service_access_tokens'
 
diff --git a/app/views/admin/hooks/_form.html.haml b/app/views/admin/hooks/_form.html.haml
index 92a664e1ca8..9f71297c700 100644
--- a/app/views/admin/hooks/_form.html.haml
+++ b/app/views/admin/hooks/_form.html.haml
@@ -5,6 +5,12 @@
   = form.text_field :url, class: 'form-control gl-form-input'
   %p.form-text.text-muted= _('URL must be percent-encoded if necessary.')
 .form-group
+  = form.label :name, s_('Webhooks|Name (optional)'), class: 'label-bold'
+  = form.text_field :name, value: hook.name, class: 'form-control gl-form-input gl-form-input-xl'
+.form-group
+  = form.label :description, s_('Webhooks|Description (optional)'), class: 'label-bold'
+  = form.text_area :description, value: hook.description, class: 'form-control gl-form-input gl-form-input-xl', rows: 4, maxlength: 2048
+.form-group
   = form.label :token, _('Secret token'), class: 'label-bold'
   = form.password_field :token, value: hook.masked_token, autocomplete: 'new-password', class: 'form-control gl-form-input gl-max-w-48'
   %p.form-text.text-muted= _('Use this token to validate received payloads.')
diff --git a/app/views/shared/web_hooks/_form.html.haml b/app/views/shared/web_hooks/_form.html.haml
index a3dfc6eb042..cdef45a0415 100644
--- a/app/views/shared/web_hooks/_form.html.haml
+++ b/app/views/shared/web_hooks/_form.html.haml
@@ -2,6 +2,12 @@
 
 .js-vue-webhook-form{ data: webhook_form_data(hook) }
 .form-group
+  = form.label :name, s_('Webhooks|Name (optional)'), class: 'label-bold'
+  = form.text_field :name, value: hook.name, class: 'form-control gl-form-input gl-form-input-xl'
+.form-group
+  = form.label :description, s_('Webhooks|Description (optional)'), class: 'label-bold'
+  = form.text_area :description, value: hook.description, class: 'form-control gl-form-input gl-form-input-xl', rows: 4, maxlength: 2048
+.form-group
   = form.label :token, s_('Webhooks|Secret token'), class: 'label-bold'
   = form.password_field :token, value: hook.masked_token, autocomplete: 'new-password', class: 'form-control gl-form-input gl-form-input-xl'
   %p.form-text.text-muted
diff --git a/app/views/shared/web_hooks/_hook.html.haml b/app/views/shared/web_hooks/_hook.html.haml
index a332fd9cce7..6c6ff5f7fc8 100644
--- a/app/views/shared/web_hooks/_hook.html.haml
+++ b/app/views/shared/web_hooks/_hook.html.haml
@@ -2,10 +2,13 @@
 - sslBadgeText = _('SSL Verification:') + ' ' + sslStatus
 
 %li.gl-border-b.gl-last-of-type-border-b-0
-  .gl-display-flex.lgl-align-items-center.row.gl-mx-0
-    .col-md-8.col-lg-7.gl-px-5
-      .light-header.gl-mb-2
+  .row.gl-mx-0
+    .col-md-8.col-lg-5.gl-px-5
+      .light-header.gl-mb-1
+        = hook.name
+      .gl-font-sm
         = hook.url
+
         - if hook.rate_limited?
           = gl_badge_tag(_('Disabled'), variant: :danger, size: :sm)
         - elsif hook.permanently_disabled?
@@ -19,7 +22,10 @@
             = gl_badge_tag(integration_webhook_event_human_name(trigger), size: :sm)
         = gl_badge_tag(sslBadgeText, size: :sm)
 
-    .col-md-4.col-lg-5.gl-mt-2.gl-px-5.gl-gap-3.gl-display-flex.gl-md-justify-content-end.gl-align-items-baseline
+    .col-md-2.col-lg-4.gl-px-5.gl-font-sm
+      = truncate(hook.description, length: 200)
+
+    .col-md-4.col-lg-3.gl-mt-2.gl-px-5.gl-gap-3.gl-display-flex.gl-md-justify-content-end.gl-align-items-baseline
       = render 'shared/web_hooks/test_button', hook: hook, size: 'small'
       = render Pajamas::ButtonComponent.new(href: edit_hook_path(hook), size: :small) do
         = _('Edit')