From 9dc93a4519d9d5d7be48ff274127136236a3adb3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 20 Apr 2021 23:50:22 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-11-stable-ee

---
 app/assets/javascripts/notes/mixins/resolvable.js | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'app/assets/javascripts/notes/mixins/resolvable.js')

diff --git a/app/assets/javascripts/notes/mixins/resolvable.js b/app/assets/javascripts/notes/mixins/resolvable.js
index baada4c5ce8..27ed8e203b0 100644
--- a/app/assets/javascripts/notes/mixins/resolvable.js
+++ b/app/assets/javascripts/notes/mixins/resolvable.js
@@ -1,24 +1,11 @@
 import { deprecatedCreateFlash as Flash } from '~/flash';
 import { __ } from '~/locale';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 export default {
-  mixins: [glFeatureFlagsMixin()],
   computed: {
     discussionResolved() {
       if (this.discussion) {
-        const { notes, resolved } = this.discussion;
-
-        if (this.glFeatures.removeResolveNote) {
-          return Boolean(resolved);
-        }
-
-        if (notes) {
-          // Decide resolved state using store. Only valid for discussions.
-          return notes.filter((note) => !note.system).every((note) => note.resolved);
-        }
-
-        return resolved;
+        return Boolean(this.discussion.resolved);
       }
 
       return this.note.resolved;
@@ -47,7 +34,7 @@ export default {
       let endpoint =
         discussion && this.discussion ? this.discussion.resolve_path : `${this.note.path}/resolve`;
 
-      if (this.glFeatures.removeResolveNote && this.discussionResolvePath) {
+      if (this.discussionResolvePath) {
         endpoint = this.discussionResolvePath;
       }
 
-- 
cgit v1.2.1