diff options
| author | Phil Hughes <me@iamphill.com> | 2018-12-13 08:28:13 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-12-13 08:28:13 +0000 |
| commit | 7a5c9f8aa86f37d4c3fe4c2c02ca5553066465ff (patch) | |
| tree | df2e83f66c29e48223df58c94b7114d6fb0329b7 | |
| parent | efbb950131f227a0a7610aca12ef55d2cf2a48c6 (diff) | |
| download | gitlab-ce-7a5c9f8aa86f37d4c3fe4c2c02ca5553066465ff.tar.gz | |
Fixed parallel discussions throwing an error
| -rw-r--r-- | app/assets/javascripts/diffs/store/mutations.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js index b971419244c..2ea884d1293 100644 --- a/app/assets/javascripts/diffs/store/mutations.js +++ b/app/assets/javascripts/diffs/store/mutations.js @@ -149,8 +149,8 @@ export default { if (left || right) { return { - left: mapDiscussions(line.left), - right: mapDiscussions(line.right, () => !left), + left: line.left ? mapDiscussions(line.left) : null, + right: line.right ? mapDiscussions(line.right, () => !left) : null, }; } |