diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-06-20 20:15:44 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-07-07 01:50:59 +0300 |
| commit | a27462a5c6da0182f6b3a55c9417e6405f2c0415 (patch) | |
| tree | 6bdf936568c0f9274cbf24db7f8b6517b2200980 /app/views/projects/notes | |
| parent | 375193455aa5cb752f1035a6cc69160170a58477 (diff) | |
Extract parts of LegacyDiffNote into DiffOnNote concern and move part of responsibility to other classes
Diffstat (limited to 'app/views/projects/notes')
| -rw-r--r-- | app/views/projects/notes/discussions/_diff_with_notes.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/notes/discussions/_diff_with_notes.html.haml b/app/views/projects/notes/discussions/_diff_with_notes.html.haml index b924ed31b42..3866de0f7fa 100644 --- a/app/views/projects/notes/discussions/_diff_with_notes.html.haml +++ b/app/views/projects/notes/discussions/_diff_with_notes.html.haml @@ -12,7 +12,7 @@ %table - note.truncated_diff_lines.each do |line| - type = line.type - - line_code = generate_line_code(note.diff_file_path, line) + - line_code = diff_file.line_code(line) %tr.line_holder{ id: line_code, class: "#{type}" } - if type == "match" %td.old_line.diff-line-num= "..." @@ -23,5 +23,5 @@ %td.new_line.diff-line-num{ data: { linenumber: type == "old" ? " ".html_safe : line.new_pos } } %td.line_content{ class: ['noteable_line', type, line_code], line_code: line_code }= diff_line_content(line.text, type) - - if line_code == note.line_code + - if note.for_line?(line) = render "projects/notes/diff_notes_with_reply", notes: discussion_notes |