Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 2 deletions

diff --git a/app/assets/javascripts/issues/show/components/fields/description.vue b/app/assets/javascripts/issues/show/components/fields/description.vue
index c9769dc9275..a1463d0e911 100644
--- a/app/assets/javascripts/issues/show/components/fields/description.vue
+++ b/app/assets/javascripts/issues/show/components/fields/description.vue
@@ -2,6 +2,8 @@
 import { __ } from '~/locale';
 import MarkdownEditor from '~/vue_shared/components/markdown/markdown_editor.vue';
 import glFeaturesFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
+import { trackSavedUsingEditor } from '~/vue_shared/components/markdown/tracking';
+import { ISSUE_NOTEABLE_TYPE } from '~/notes/constants';
 import updateMixin from '../../mixins/update';
 
 export default {
@@ -55,6 +57,10 @@ export default {
     focus() {
       this.$refs.textarea?.focus();
     },
+    saveIssuable() {
+      trackSavedUsingEditor(this.$refs.markdownEditor.isContentEditorActive, ISSUE_NOTEABLE_TYPE);
+      this.updateIssuable();
+    },
   },
 };
 </script>
@@ -63,6 +69,7 @@ export default {
   <div class="common-note-form">
     <label class="sr-only" for="issue-description">{{ __('Description') }}</label>
     <markdown-editor
+      ref="markdownEditor"
       :enable-content-editor="Boolean(glFeatures.contentEditorOnIssues)"
       class="gl-mt-3"
       :value="value"
@@ -75,8 +82,8 @@ export default {
       autofocus
       data-qa-selector="description_field"
       @input="$emit('input', $event)"
-      @keydown.meta.enter="updateIssuable"
-      @keydown.ctrl.enter="updateIssuable"
+      @keydown.meta.enter="saveIssuable"
+      @keydown.ctrl.enter="saveIssuable"
     />
   </div>
 </template>