Welcome to mirror list, hosted at ThFree Co, Russian Federation.

_parallel_view.html.haml « diffs « projects « views « app - gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
blob: 8abbba5b46d2e0591e9b8bf50f702003b64bf07d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
/ Side-by-side diff view
%div.text-file.diff-wrap-lines
  %table
    - parallel_diff(diff_file, index).each do |line|
      - type_left = line[0]
      - line_number_left = line[1]
      - line_content_left = line[2]
      - line_code = line[3]
      - line_code_next = line[4]
      - type_right = line[5]
      - line_number_right = line[6]
      - line_content_right = line[7]

      %tr.line_holder.parallel
        - if type_left == 'match'
          = render "projects/diffs/match_line_parallel", { line: line_content_left,
          line_old: line_number_left, line_new: line_number_right }
        - elsif type_left ==  'old' || type_left.nil?
          %td.old_line{id: line_code, class: "#{type_left}"}
            = link_to raw(line_number_left), "##{line_code}", id: line_code
            %td.line_content{class: "parallel noteable_line #{type_left} #{line_code}", "line_code" => line_code }= raw line_content_left

          - if type_right == 'new'
            - new_line_class = 'new'
            - new_line_code = line_code_next
          - else
            - new_line_class = nil
            - new_line_code = line_code

          %td.new_line{id: new_line_code, class: "#{new_line_class}", data: { linenumber: line_number_right }}
            = link_to raw(line_number_right), "##{new_line_code}", id: new_line_code
            %td.line_content.parallel{class: "noteable_line #{new_line_class} #{new_line_code}", "line_code" => new_line_code}= raw line_content_right

      - if @reply_allowed
        - if type_left.nil? && type_right == 'new'
          - comments1 = nil
        - else
          - comments1 = line_comments[line_code]
        - unless type_left.nil? && type_right.nil?
          - comments2 = line_comments[line_code_next]

        - if comments1.present? || comments2.present?
          = render "projects/notes/diff_notes_with_reply_parallel", notes1: comments1, notes2: comments2

- if diff_file.diff.diff.blank? && diff_file.mode_changed?
  .file-mode-changed
    File mode changed