diff options
author | Douwe Maan <douwe@selenight.nl> | 2016-06-20 20:23:46 +0300 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2016-07-07 01:51:00 +0300 |
commit | 29d574868a044fbfdf7a2458fbb3d951cfe58171 (patch) | |
tree | 5344a08af20c1e0bb3fb50ad8dd696485bd0946a /app/views/projects/diffs/_text_file.html.haml | |
parent | 521a0a20f7b52a2fb6ea209b39824a752f2613bd (diff) |
Display new diff notes and allow creation through the web interface
Diffstat (limited to 'app/views/projects/diffs/_text_file.html.haml')
-rw-r--r-- | app/views/projects/diffs/_text_file.html.haml | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/app/views/projects/diffs/_text_file.html.haml b/app/views/projects/diffs/_text_file.html.haml index 068593a7dd1..192093d1273 100644 --- a/app/views/projects/diffs/_text_file.html.haml +++ b/app/views/projects/diffs/_text_file.html.haml @@ -4,22 +4,17 @@ %a.show-suppressed-diff.js-show-suppressed-diff Changes suppressed. Click to show. %table.text-file.code.js-syntax-highlight{ class: too_big ? 'hide' : '' } - - last_line = 0 - - diff_file.highlighted_diff_lines.each_with_index do |line, index| - - line_code = generate_line_code(diff_file.file_path, line) + - diff_file.highlighted_diff_lines.each do |line| - last_line = line.new_pos - = render "projects/diffs/line", {line: line, diff_file: diff_file, line_code: line_code} + = render "projects/diffs/line", line: line, diff_file: diff_file - unless @diff_notes_disabled - - diff_notes = @grouped_diff_notes[line_code] + - line_code = diff_file.line_code(line) + - diff_notes = @grouped_diff_notes[line_code] if line_code - if diff_notes = render "projects/notes/diff_notes_with_reply", notes: diff_notes - if last_line > 0 = render "projects/diffs/match_line", { line: "", line_old: last_line, line_new: last_line, bottom: true, new_file: diff_file.new_file } - -- if diff_file.diff.blank? && diff_file.mode_changed? - .file-mode-changed - File mode changed |