Merge branch '9962-ee-diff-note-actions' into 'master'

Resolve "Move EE differences for `app/assets/javascripts/notes/components/note_actions.vue`"

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

app/assets/javascripts/batch_comments/mixins/resolved_status.js

+export default {
+  computed: {
+    resolveButtonTitle() {
+      let title = 'Mark as resolved';
+
+      if (this.resolvedBy) {
+        title = `Resolved by ${this.resolvedBy.name}`;
+      }
+
+      return title;
+    },
+  },
+};

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

@@ -2,7 +2,7 @@
 import { mapGetters } from 'vuex';
 import Icon from '~/vue_shared/components/icon.vue';
 import { GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui';
-import resolvedStatusMixin from 'ee/batch_comments/mixins/resolved_status';
+import resolvedStatusMixin from 'ee_else_ce/batch_comments/mixins/resolved_status';
 import ReplyButton from './note_actions/reply_button.vue';
 
 export default {
@@ -100,17 +100,6 @@ export default {
     currentUserId() {
       return this.getUserDataByProp('id');
     },
-    resolveButtonTitle() {
-      if (this.isDraft || this.discussionId) return this.resolvedStatusMessage;
-
-      let title = 'Mark as resolved';
-
-      if (this.resolvedBy) {
-        title = `Resolved by ${this.resolvedBy.name}`;
-      }
-
-      return title;
-    },
   },
   methods: {
     onEdit() {
@@ -128,7 +117,6 @@ export default {
       });
     },
   },
-  showStaysResolved: true,
 };
 </script>
 

ee/app/assets/javascripts/batch_comments/mixins/resolved_status.js

@@ -51,5 +51,17 @@ export default {
     componentClasses() {
       return this.resolveDiscussion ? 'is-resolving-discussion' : 'is-unresolving-discussion';
     },
+    resolveButtonTitle() {
+      if (this.isDraft || this.discussionId) return this.resolvedStatusMessage;
+
+      let title = 'Mark as resolved';
+
+      if (this.resolvedBy) {
+        title = `Resolved by ${this.resolvedBy.name}`;
+      }
+
+      return title;
+    },
   },
+  showStaysResolved: true,
 };