2015-04-26 12:48:37 +05:30
|
|
|
- too_big = diff_file.diff_lines.count > Commit::DIFF_SAFE_LINES
|
|
|
|
- if too_big
|
2015-09-11 14:41:01 +05:30
|
|
|
.suppressed-container
|
|
|
|
%a.show-suppressed-diff.js-show-suppressed-diff Changes suppressed. Click to show.
|
2015-04-26 12:48:37 +05:30
|
|
|
|
2016-01-29 22:53:50 +05:30
|
|
|
%table.text-file.code.js-syntax-highlight{ class: too_big ? 'hide' : '' }
|
|
|
|
|
2015-04-26 12:48:37 +05:30
|
|
|
- last_line = 0
|
2016-01-29 22:53:50 +05:30
|
|
|
- raw_diff_lines = diff_file.diff_lines
|
|
|
|
- diff_file.highlighted_diff_lines.each_with_index do |line, index|
|
2015-04-26 12:48:37 +05:30
|
|
|
- type = line.type
|
|
|
|
- last_line = line.new_pos
|
|
|
|
- line_code = generate_line_code(diff_file.file_path, line)
|
|
|
|
- line_old = line.old_pos
|
|
|
|
%tr.line_holder{ id: line_code, class: "#{type}" }
|
|
|
|
- if type == "match"
|
|
|
|
= render "projects/diffs/match_line", {line: line.text,
|
2015-09-11 14:41:01 +05:30
|
|
|
line_old: line_old, line_new: line.new_pos, bottom: false, new_file: diff_file.new_file}
|
2016-01-29 22:53:50 +05:30
|
|
|
- elsif type == 'nonewline'
|
|
|
|
%td.old_line.diff-line-num
|
|
|
|
%td.new_line.diff-line-num
|
2016-02-05 20:25:01 +05:30
|
|
|
%td.line_content.match= line.text
|
2015-04-26 12:48:37 +05:30
|
|
|
- else
|
2016-02-05 20:25:01 +05:30
|
|
|
%td.old_line.diff-line-num{class: type}
|
2015-04-26 12:48:37 +05:30
|
|
|
= link_to raw(type == "new" ? " " : line_old), "##{line_code}", id: line_code
|
2015-09-11 14:41:01 +05:30
|
|
|
- if @comments_allowed && can?(current_user, :create_note, @project)
|
2015-04-26 12:48:37 +05:30
|
|
|
= link_to_new_diff_note(line_code)
|
2016-02-05 20:25:01 +05:30
|
|
|
%td.new_line.diff-line-num{class: type, data: {linenumber: line.new_pos}}
|
2016-01-29 22:53:50 +05:30
|
|
|
= link_to raw(type == "old" ? " " : line.new_pos), "##{line_code}", id: line_code
|
|
|
|
%td.line_content{class: "noteable_line #{type} #{line_code}", data: { line_code: line_code }}= diff_line_content(line.text)
|
2015-04-26 12:48:37 +05:30
|
|
|
|
|
|
|
- if @reply_allowed
|
|
|
|
- comments = @line_notes.select { |n| n.line_code == line_code && n.active? }.sort_by(&:created_at)
|
|
|
|
- unless comments.empty?
|
2016-01-29 22:53:50 +05:30
|
|
|
= render "projects/notes/diff_notes_with_reply", notes: comments, line: raw_diff_lines[index].text
|
2015-04-26 12:48:37 +05:30
|
|
|
|
|
|
|
- if last_line > 0
|
2016-04-02 18:10:28 +05:30
|
|
|
= render "projects/diffs/match_line", { line: "",
|
|
|
|
line_old: last_line, line_new: last_line, bottom: true, new_file: diff_file.new_file }
|
2015-04-26 12:48:37 +05:30
|
|
|
|
|
|
|
- if diff_file.diff.blank? && diff_file.mode_changed?
|
|
|
|
.file-mode-changed
|
|
|
|
File mode changed
|