Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 3 deletions

diff --git a/app/assets/javascripts/notes/components/discussion_actions.vue b/app/assets/javascripts/notes/components/discussion_actions.vue
index e3be91a4966..6bbf2fa6ee4 100644
--- a/app/assets/javascripts/notes/components/discussion_actions.vue
+++ b/app/assets/javascripts/notes/components/discussion_actions.vue
@@ -36,10 +36,11 @@ export default {
     },
   },
   computed: {
+    resolvableNotes() {
+      return this.discussion.notes.filter(x => x.resolvable);
+    },
     userCanResolveDiscussion() {
-      return this.discussion.notes.every(
-        note => note.current_user && note.current_user.can_resolve,
-      );
+      return this.resolvableNotes.every(note => note.current_user && note.current_user.can_resolve);
     },
   },
 };