diff options
author | Phil Hughes <me@iamphill.com> | 2019-04-12 10:27:24 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-04-12 10:27:24 +0100 |
commit | b13ecdd6cc0d972a4563e1509d499969676f1488 (patch) | |
tree | d02fed2f5bf132c96192d75d0454f3c04fe995be /app/assets/javascripts/diffs/store | |
parent | 0276b8682e37d361adbd1ac89d9ba6992f0d1b60 (diff) | |
download | gitlab-ce-b13ecdd6cc0d972a4563e1509d499969676f1488.tar.gz |
CE backport of image-comment-reviews
Diffstat (limited to 'app/assets/javascripts/diffs/store')
-rw-r--r-- | app/assets/javascripts/diffs/store/mutations.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js index 856f4eaf00a..572fbfb5be4 100644 --- a/app/assets/javascripts/diffs/store/mutations.js +++ b/app/assets/javascripts/diffs/store/mutations.js @@ -160,7 +160,9 @@ export default { } if (!file.parallel_diff_lines || !file.highlighted_diff_lines) { - file.discussions = (file.discussions || []).concat(discussion); + file.discussions = (file.discussions || []) + .filter(d => d.id !== discussion.id) + .concat(discussion); } return file; |