2014-09-08 09:26:49 -04:00
|
|
|
- too_big = diff_file.diff_lines.count > Commit::DIFF_SAFE_LINES
|
2012-04-05 18:00:15 -04:00
|
|
|
- if too_big
|
2015-07-23 15:55:49 -04:00
|
|
|
.suppressed-container
|
|
|
|
%a.show-suppressed-diff.js-show-suppressed-diff Changes suppressed. Click to show.
|
2012-04-05 18:00:15 -04:00
|
|
|
|
2015-12-15 18:09:09 -05:00
|
|
|
%table.text-file.code.js-syntax-highlight{ class: [user_color_scheme, too_big ? 'hide' : ''] }
|
|
|
|
|
2014-08-02 11:12:01 -04:00
|
|
|
- last_line = 0
|
2014-09-08 09:26:49 -04:00
|
|
|
- diff_file.diff_lines.each_with_index do |line, index|
|
|
|
|
- type = line.type
|
|
|
|
- last_line = line.new_pos
|
2014-09-08 14:54:52 -04:00
|
|
|
- line_code = generate_line_code(diff_file.file_path, line)
|
2014-09-08 09:26:49 -04:00
|
|
|
- line_old = line.old_pos
|
2013-04-21 04:20:56 -04:00
|
|
|
%tr.line_holder{ id: line_code, class: "#{type}" }
|
2012-02-13 17:20:23 -05:00
|
|
|
- if type == "match"
|
2014-09-08 09:26:49 -04:00
|
|
|
= render "projects/diffs/match_line", {line: line.text,
|
2015-02-08 18:12:44 -05:00
|
|
|
line_old: line_old, line_new: line.new_pos, bottom: false, new_file: diff_file.new_file}
|
2012-06-03 18:37:27 -04:00
|
|
|
- else
|
2012-02-13 17:20:23 -05:00
|
|
|
%td.old_line
|
2012-08-10 18:07:50 -04:00
|
|
|
= link_to raw(type == "new" ? " " : line_old), "##{line_code}", id: line_code
|
2015-06-26 09:55:56 -04:00
|
|
|
- if @comments_allowed && can?(current_user, :create_note, @project)
|
2014-06-06 16:15:54 -04:00
|
|
|
= link_to_new_diff_note(line_code)
|
2014-09-08 09:26:49 -04:00
|
|
|
%td.new_line{data: {linenumber: line.new_pos}}
|
|
|
|
= link_to raw(type == "old" ? " " : line.new_pos) , "##{line_code}", id: line_code
|
2015-12-15 18:09:09 -05:00
|
|
|
%td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}<
|
|
|
|
= highlight_line(diff_file.new_path, unescape_html(diff_line_content(line.text)))
|
2012-06-03 18:37:27 -04:00
|
|
|
|
2012-11-17 18:41:30 -05:00
|
|
|
- if @reply_allowed
|
2015-04-03 10:46:23 -04:00
|
|
|
- comments = @line_notes.select { |n| n.line_code == line_code && n.active? }.sort_by(&:created_at)
|
2012-11-17 18:41:30 -05:00
|
|
|
- unless comments.empty?
|
2014-09-08 09:26:49 -04:00
|
|
|
= render "projects/notes/diff_notes_with_reply", notes: comments, line: line.text
|
2013-10-09 16:22:37 -04:00
|
|
|
|
2014-08-02 11:12:01 -04:00
|
|
|
- if last_line > 0
|
2014-09-08 09:26:49 -04:00
|
|
|
= render "projects/diffs/match_line", {line: "",
|
2015-02-08 18:12:44 -05:00
|
|
|
line_old: last_line, line_new: last_line, bottom: true, new_file: diff_file.new_file}
|
2014-08-02 11:12:01 -04:00
|
|
|
|
2014-09-08 15:25:20 -04:00
|
|
|
- if diff_file.diff.blank? && diff_file.mode_changed?
|
2014-06-14 15:54:56 -04:00
|
|
|
.file-mode-changed
|
|
|
|
File mode changed
|