3022786948
Conflicts: app/assets/stylesheets/sections/notes.scss app/contexts/notes/load_context.rb app/models/project.rb app/observers/note_observer.rb app/roles/votes.rb app/views/commit/show.html.haml app/views/merge_requests/_show.html.haml app/views/merge_requests/diffs.js.haml app/views/merge_requests/show.js.haml app/views/notes/_note.html.haml features/steps/project/project_merge_requests.rb spec/models/note_spec.rb
23 lines
1 KiB
Text
23 lines
1 KiB
Text
- too_big = diff.diff.lines.count > 1000
|
|
- if too_big
|
|
%a.supp_diff_link Diff suppressed. Click to show
|
|
|
|
%table{class: "#{'hide' if too_big}"}
|
|
- each_diff_line(diff.diff.lines.to_a, index) do |line, type, line_code, line_new, line_old|
|
|
%tr.line_holder{ id: line_code }
|
|
- if type == "match"
|
|
%td.old_line= "..."
|
|
%td.new_line= "..."
|
|
%td.line_content.matched= line
|
|
- else
|
|
%td.old_line
|
|
= link_to raw(type == "new" ? " " : line_old), "##{line_code}", id: line_code
|
|
- if @comments_allowed
|
|
= render "notes/diff_note_link", line_code: line_code
|
|
%td.new_line= link_to raw(type == "old" ? " " : line_new) , "##{line_code}", id: line_code
|
|
%td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw diff_line_content(line)
|
|
|
|
- if @reply_allowed
|
|
- comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at)
|
|
- unless comments.empty?
|
|
= render "notes/diff_notes_with_reply", notes: comments
|