diff options
author | Simon Knox <simon@gitlab.com> | 2018-07-05 22:10:38 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2018-07-05 22:10:38 +0000 |
commit | 9dc6b0399767985c8e0cb1b6b34aff3acd631780 (patch) | |
tree | 9ca691600ba30fa0e834e5fed16b74f00d484bda /app/assets/javascripts/notes/stores | |
parent | 5e70a09480fba717b4d73c014e3ba71f4679b9a4 (diff) | |
download | gitlab-ce-9dc6b0399767985c8e0cb1b6b34aff3acd631780.tar.gz |
Resolve "MRs are showing some discussions as unresolved"
Diffstat (limited to 'app/assets/javascripts/notes/stores')
-rw-r--r-- | app/assets/javascripts/notes/stores/getters.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/stores/getters.js b/app/assets/javascripts/notes/stores/getters.js index a5518383d44..5c65e1c3bb5 100644 --- a/app/assets/javascripts/notes/stores/getters.js +++ b/app/assets/javascripts/notes/stores/getters.js @@ -85,9 +85,9 @@ export const allDiscussions = (state, getters) => { export const resolvedDiscussionsById = state => { const map = {}; - state.discussions.forEach(n => { + state.discussions.filter(d => d.resolvable).forEach(n => { if (n.notes) { - const resolved = n.notes.every(note => note.resolved && !note.system); + const resolved = n.notes.filter(note => note.resolvable).every(note => note.resolved); if (resolved) { map[n.id] = n; |