Commit 2cf486bb authored by Phil Hughes's avatar Phil Hughes

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-ce!27900
parents e6665c2e 5a5d52fe
export default {
computed: {
resolveButtonTitle() {
let title = 'Mark as resolved';
if (this.resolvedBy) {
title = `Resolved by ${this.resolvedBy.name}`;
}
return title;
},
},
};
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import { GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui'; import { GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui';
import resolvedStatusMixin from 'ee_else_ce/batch_comments/mixins/resolved_status';
import ReplyButton from './note_actions/reply_button.vue'; import ReplyButton from './note_actions/reply_button.vue';
export default { export default {
...@@ -14,6 +15,7 @@ export default { ...@@ -14,6 +15,7 @@ export default {
directives: { directives: {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
}, },
mixins: [resolvedStatusMixin],
props: { props: {
authorId: { authorId: {
type: Number, type: Number,
...@@ -98,15 +100,6 @@ export default { ...@@ -98,15 +100,6 @@ export default {
currentUserId() { currentUserId() {
return this.getUserDataByProp('id'); return this.getUserDataByProp('id');
}, },
resolveButtonTitle() {
let title = 'Mark as resolved';
if (this.resolvedBy) {
title = `Resolved by ${this.resolvedBy.name}`;
}
return title;
},
}, },
methods: { methods: {
onEdit() { onEdit() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment