diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-30 20:34:14 -0600 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
| commit | fe26b8af94e8e12a66249e28e34196a4f8b987c4 (patch) | |
| tree | d4a2978d3d28afdb45b69f177293167dd018717a /app/views/discussions/_diff_with_notes.html.haml | |
| parent | bb8cc946689bfafb1e3a65aa00b8e75fb8a5006b (diff) | |
| download | gitlab-ce-fe26b8af94e8e12a66249e28e34196a4f8b987c4.tar.gz | |
Correctly display multiple separate discussions on the same diff line
Diffstat (limited to 'app/views/discussions/_diff_with_notes.html.haml')
| -rw-r--r-- | app/views/discussions/_diff_with_notes.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/discussions/_diff_with_notes.html.haml b/app/views/discussions/_diff_with_notes.html.haml index 94408b92374..549364761e6 100644 --- a/app/views/discussions/_diff_with_notes.html.haml +++ b/app/views/discussions/_diff_with_notes.html.haml @@ -7,7 +7,7 @@ .diff-content.code.js-syntax-highlight %table - - discussions = { discussion.original_line_code => discussion } + - discussions = { discussion.original_line_code => [discussion] } = render partial: "projects/diffs/line", collection: discussion.truncated_diff_lines, as: :line, |