Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 1 deletions

diff --git a/app/assets/javascripts/vue_shared/components/awards_list.vue b/app/assets/javascripts/vue_shared/components/awards_list.vue
index fd74ded7dc8..59f03b41144 100644
--- a/app/assets/javascripts/vue_shared/components/awards_list.vue
+++ b/app/assets/javascripts/vue_shared/components/awards_list.vue
@@ -210,7 +210,6 @@ export default {
         @hidden="setIsMenuOpen(false)"
       >
         <template #button-content>
-          <span class="gl-sr-only">{{ __('Add reaction') }}</span>
           <span class="reaction-control-icon reaction-control-icon-neutral">
             <gl-icon name="slight-smile" />
           </span>
diff --git a/app/assets/javascripts/vue_shared/components/markdown/tracking.js b/app/assets/javascripts/vue_shared/components/markdown/tracking.js
new file mode 100644
index 00000000000..2628054ae5f
--- /dev/null
+++ b/app/assets/javascripts/vue_shared/components/markdown/tracking.js
@@ -0,0 +1,14 @@
+import Tracking from '~/tracking';
+
+export const EDITOR_TRACKING_LABEL = 'editor_tracking';
+export const EDITOR_TYPE_ACTION = 'editor_type_used';
+export const EDITOR_TYPE_PLAIN_TEXT_EDITOR = 'editor_type_plain_text_editor';
+export const EDITOR_TYPE_RICH_TEXT_EDITOR = 'editor_type_rich_text_editor';
+
+export const trackSavedUsingEditor = (isRichText, context) => {
+  Tracking.event(undefined, EDITOR_TYPE_ACTION, {
+    label: EDITOR_TRACKING_LABEL,
+    editorType: isRichText ? EDITOR_TYPE_RICH_TEXT_EDITOR : EDITOR_TYPE_PLAIN_TEXT_EDITOR,
+    context,
+  });
+};