diff options
Diffstat (limited to 'app/assets/javascripts/batch_comments/mixins')
-rw-r--r-- | app/assets/javascripts/batch_comments/mixins/resolved_status.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/batch_comments/mixins/resolved_status.js b/app/assets/javascripts/batch_comments/mixins/resolved_status.js index 2517fb198f0..0b085da1ff9 100644 --- a/app/assets/javascripts/batch_comments/mixins/resolved_status.js +++ b/app/assets/javascripts/batch_comments/mixins/resolved_status.js @@ -1,7 +1,9 @@ import { mapGetters } from 'vuex'; import { sprintf, s__, __ } from '~/locale'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; export default { + mixins: [glFeatureFlagsMixin()], props: { discussionId: { type: String, @@ -54,6 +56,10 @@ export default { let title = __('Mark as resolved'); + if (this.glFeatures.removeResolveNote) { + title = __('Resolve thread'); + } + if (this.resolvedBy) { title = sprintf(__('Resolved by %{name}'), { name: this.resolvedBy.name }); } |