Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/notes/components/note_form.vue

@@ -101,6 +101,7 @@ export default {
       isResolving: this.resolveDiscussion,
       isUnresolving: !this.resolveDiscussion,
       resolveAsThread: true,
+      isSubmittingWithKeydown: false,
     };
   },
   computed: {
@@ -241,6 +242,10 @@ export default {
       this.$emit('cancelForm', shouldConfirm, this.noteBody !== this.updatedNoteBody);
     },
     onInput() {
+      if (this.isSubmittingWithKeydown) {
+        return;
+      }
+
       if (this.autosaveKey) {
         const { autosaveKey, updatedNoteBody: text } = this;
         updateDraft(autosaveKey, text);
@@ -250,6 +255,7 @@ export default {
       if (this.showBatchCommentsActions) {
         this.handleAddToReview();
       } else {
+        this.isSubmittingWithKeydown = true;
         this.handleUpdate();
       }
     },

changelogs/unreleased/216631-cmd-enter-no-clear-comment-text.yml

@@ -0,0 +1,5 @@
+---
+title: Prevent autosave when reply comment via cmd+enter
+merge_request: 35716
+author:
+type: fixed

spec/frontend/notes/components/note_form_spec.js

@@ -245,6 +245,24 @@ describe('issue_note_form component', () => {
 
       expect(updateDraft).toHaveBeenCalledWith(dummyAutosaveKey, dummyContent);
     });
+
+    it('does not save draft when ctrl+enter is pressed', () => {
+      const options = {
+        noteBody: '',
+        autosaveKey: dummyAutosaveKey,
+      };
+
+      props = { ...props, ...options };
+      wrapper = createComponentWrapper();
+
+      wrapper.setData({ isSubmittingWithKeydown: true });
+
+      const textarea = wrapper.find('textarea');
+      textarea.setValue('some content');
+      textarea.trigger('keydown.enter', { metaKey: true });
+
+      expect(updateDraft).not.toHaveBeenCalled();
+    });
   });
 
   describe('with batch comments', () => {