Merge branch 'note-body-ee-differences-ee' into 'master'

Fixed EE differences in note_body.vue

See merge request gitlab-org/gitlab-ee!10644

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

 <script>
-import { mapGetters, mapActions } from 'vuex';
+import { mapActions } from 'vuex';
 import $ from 'jquery';
+import getDiscussion from 'ee_else_ce/notes/mixins/get_discussion';
 import noteEditedText from './note_edited_text.vue';
 import noteAwardsList from './note_awards_list.vue';
 import noteAttachment from './note_attachment.vue';
@@ -16,7 +17,7 @@ export default {
     noteForm,
     Suggestions,
   },
-  mixins: [autosave],
+  mixins: [autosave, getDiscussion],
   props: {
     note: {
       type: Object,
@@ -43,7 +44,6 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(['getDiscussion']),
     noteBody() {
       return this.note.note;
     },
@@ -53,11 +53,6 @@ export default {
     lineType() {
       return this.line ? this.line.type : null;
     },
-    discussion() {
-      if (!this.note.isDraft) return {};
-
-      return this.getDiscussion(this.note.discussion_id);
-    },
   },
   mounted() {
     this.renderGFM();

app/assets/javascripts/notes/mixins/get_discussion.js

+export default {
+  computed: {
+    discussion() {
+      return {};
+    },
+  },
+};

ee/app/assets/javascripts/notes/mixins/get_discussion.js

+import { mapGetters } from 'vuex';
+
+export default {
+  computed: {
+    ...mapGetters(['getDiscussion']),
+    discussion() {
+      if (!this.note.isDraft) return {};
+
+      return this.getDiscussion(this.note.discussion_id);
+    },
+  },
+};