deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2889 from kennytm/master

Browse source 
Show only ≤16 lines of codes in a discussion in a MR (issue #2860).
This commit is contained in:
Dmitriy Zaporozhets 2013-02-26 00:32:02 -08:00
commit 0cc95ef2f5
2 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/views/notes/_discussion_diff.html.haml
View file

@ -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