Add latest changes from gitlab-org/gitlab@master

4 files changed, 29 insertions, 3 deletions

diff --git a/app/assets/javascripts/tracking/constants.js b/app/assets/javascripts/tracking/constants.js
index d0447fa167c..114587bb363 100644
--- a/app/assets/javascripts/tracking/constants.js
+++ b/app/assets/javascripts/tracking/constants.js
@@ -20,6 +20,7 @@ export const DEFAULT_SNOWPLOW_OPTIONS = {
 export const ACTION_ATTR_SELECTOR = '[data-track-action]';
 export const LOAD_ACTION_ATTR_SELECTOR = '[data-track-action="render"]';
 export const INTERNAL_EVENTS_SELECTOR = '[data-event-tracking]';
+export const LOAD_INTERNAL_EVENTS_SELECTOR = '[data-event-tracking-load="true"]';
 
 export const URLS_CACHE_STORAGE_KEY = 'gl-snowplow-pseudonymized-urls';
 
diff --git a/app/assets/javascripts/tracking/index.js b/app/assets/javascripts/tracking/index.js
index 7c2cd6fde27..ffbd932c02b 100644
--- a/app/assets/javascripts/tracking/index.js
+++ b/app/assets/javascripts/tracking/index.js
@@ -71,4 +71,5 @@ export function initDefaultTrackers() {
   Tracking.trackLoadEvents();
 
   InternalEvents.bindInternalEventDocument();
+  InternalEvents.trackInternalLoadEvents();
 }
diff --git a/app/assets/javascripts/tracking/internal_events.js b/app/assets/javascripts/tracking/internal_events.js
index 4d9c7761347..a5fbb55ff63 100644
--- a/app/assets/javascripts/tracking/internal_events.js
+++ b/app/assets/javascripts/tracking/internal_events.js
@@ -1,9 +1,13 @@
 import API from '~/api';
 
 import Tracking from './tracking';
-import { GITLAB_INTERNAL_EVENT_CATEGORY, SERVICE_PING_SCHEMA } from './constants';
+import {
+  GITLAB_INTERNAL_EVENT_CATEGORY,
+  LOAD_INTERNAL_EVENTS_SELECTOR,
+  SERVICE_PING_SCHEMA,
+} from './constants';
 import { Tracker } from './tracker';
-import { InternalEventHandler } from './utils';
+import { InternalEventHandler, createInternalEventPayload } from './utils';
 
 const InternalEvents = {
   /**
@@ -53,6 +57,27 @@ const InternalEvents = {
     parent.addEventListener(handler.name, handler.func);
     return handler;
   },
+  /**
+   * Attaches internal event handlers for load events.
+   * @param {HTMLElement} parent - element containing event targets
+   * @returns {Array}
+   */
+  trackInternalLoadEvents(parent = document) {
+    if (!Tracker.enabled()) {
+      return [];
+    }
+
+    const loadEvents = parent.querySelectorAll(LOAD_INTERNAL_EVENTS_SELECTOR);
+
+    loadEvents.forEach((element) => {
+      const action = createInternalEventPayload(element);
+      if (action) {
+        this.track_event(action);
+      }
+    });
+
+    return loadEvents;
+  },
 };
 
 export default InternalEvents;
diff --git a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_edit_form.vue b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_edit_form.vue
index 387fc5e0d1c..7c3dd5c3623 100644
--- a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_edit_form.vue
+++ b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_edit_form.vue
@@ -130,7 +130,6 @@ export default {
       :label="__('Description')"
       :label-sr-only="!showFieldTitle"
       label-for="issuable-description"
-      label-class="gl-pb-0!"
       class="col-12 gl-px-0 common-note-form"
     >
       <markdown-field