diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-26 00:32:02 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-26 00:32:02 -0800 |
| commit | 0cc95ef2f56c4b779fca613c61789483fa8d2ae8 (patch) | |
| tree | 58b4bc5166c172c86b0414322476ac508d4da1f4 /app/views/notes | |
| parent | 573942263adf806b6eb61d04ba6e748334a4a519 (diff) | |
| parent | e565be241f39cf4119cb1d3e2668455ed11630fe (diff) | |
| download | gitlab-ce-0cc95ef2f56c4b779fca613c61789483fa8d2ae8.tar.gz | |
Merge pull request #2889 from kennytm/master
Show only ≤16 lines of codes in a discussion in a MR (issue #2860).
Diffstat (limited to 'app/views/notes')
| -rw-r--r-- | app/views/notes/_discussion_diff.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/notes/_discussion_diff.html.haml b/app/views/notes/_discussion_diff.html.haml index 790b77333d5..20bdb3f3562 100644 --- a/app/views/notes/_discussion_diff.html.haml +++ b/app/views/notes/_discussion_diff.html.haml @@ -9,7 +9,7 @@ %br/ .content %table - - each_diff_line(diff, note.diff_file_index) do |line, type, line_code, line_new, line_old| + - each_diff_line_near(diff, note.diff_file_index, note.line_code) do |line, type, line_code, line_new, line_old| %tr.line_holder{ id: line_code } - if type == "match" %td.old_line= "..." @@ -22,4 +22,3 @@ - if line_code == note.line_code = render "notes/diff_notes_with_reply", notes: discussion_notes - - break # cut off diff after notes |