summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorPaul Slaughter <pslaughter@gitlab.com>2018-12-10 16:41:22 -0600
committerPaul Slaughter <pslaughter@gitlab.com>2018-12-10 16:44:35 -0600
commit958aaebdde3255df1cfd45e1e75c7a0c19700a6c (patch)
treecdfd1055507869715afcda8b829617bafb0d0f3d /app/assets
parentbea8e0626ddd18ad9a2059c65e9005632fb48921 (diff)
downloadgitlab-ce-958aaebdde3255df1cfd45e1e75c7a0c19700a6c.tar.gz
Fix MR discussion counts being off
**What was the issue?** Notes can be unresolved, but not resolvable. Without this, the unresolvedDiscussionsCount was inflated. **References** https://gitlab.com/gitlab-org/gitlab-ce/issues/55138
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/notes/stores/mutations.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js
index a3228f2cfea..39ff0ff73d7 100644
--- a/app/assets/javascripts/notes/stores/mutations.js
+++ b/app/assets/javascripts/notes/stores/mutations.js
@@ -246,7 +246,7 @@ export default {
discussion =>
!discussion.individual_note &&
discussion.resolvable &&
- discussion.notes.some(note => !note.resolved),
+ discussion.notes.some(note => note.resolvable && !note.resolved),
).length;
state.hasUnresolvedDiscussions = state.unresolvedDiscussionsCount > 1;
},