Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 7 deletions

diff --git a/app/assets/javascripts/batch_comments/mixins/resolved_status.js b/app/assets/javascripts/batch_comments/mixins/resolved_status.js
index 0b085da1ff9..85bdf6b7a36 100644
--- a/app/assets/javascripts/batch_comments/mixins/resolved_status.js
+++ b/app/assets/javascripts/batch_comments/mixins/resolved_status.js
@@ -1,9 +1,7 @@
 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,11 +52,7 @@ export default {
     resolveButtonTitle() {
       if (this.isDraft || this.discussionId) return this.resolvedStatusMessage;
 
-      let title = __('Mark as resolved');
-
-      if (this.glFeatures.removeResolveNote) {
-        title = __('Resolve thread');
-      }
+      let title = __('Resolve thread');
 
       if (this.resolvedBy) {
         title = sprintf(__('Resolved by %{name}'), { name: this.resolvedBy.name });