diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-12-17 12:51:50 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-12-17 12:51:50 +0000 |
| commit | 2f4fe2b503044fd2da39acd96b855a597a61ea29 (patch) | |
| tree | 99b11a3ae2be20c8a30cdd57af173b0d054c5c7f /app/assets/javascripts | |
| parent | 19fec9a800eca581ecbc4b17012dfd5e720ed3f2 (diff) | |
| parent | e64c9c211245f9acac422e38673d7a7e77f1801d (diff) | |
| download | gitlab-ce-2f4fe2b503044fd2da39acd96b855a597a61ea29.tar.gz | |
Merge branch 'inline-duplicated-discussions' into 'master'
Fixed duplicated inline diff discussions
Closes #55388
See merge request gitlab-org/gitlab-ce!23843
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/diffs/store/mutations.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js index 2ea884d1293..ed4203cf5e0 100644 --- a/app/assets/javascripts/diffs/store/mutations.js +++ b/app/assets/javascripts/diffs/store/mutations.js @@ -138,7 +138,7 @@ export default { if (file.highlighted_diff_lines) { file.highlighted_diff_lines = file.highlighted_diff_lines.map(line => - mapDiscussions(line), + lineCheck(line) ? mapDiscussions(line) : line, ); } |