summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/conflicts/components/_inline_conflict_lines.html.haml
blob: f094df7fcaa921e182f09e60771ad447f1c18263 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
%inline-conflict-lines{ "inline-template" => "true", ":file" => "file"}
  %table
    %tr.line_holder.diff-inline{"v-for" => "line in file.inlineLines"}
      %td.diff-line-num.new_line{":class" => "lineCssClass(line)", "v-if" => "!line.isHeader"}
        %a {{line.new_line}}
      %td.diff-line-num.old_line{":class" => "lineCssClass(line)", "v-if" => "!line.isHeader"}
        %a {{line.old_line}}
      %td.line_content{":class" => "lineCssClass(line)", "v-if" => "!line.isHeader"}
        {{{line.richText}}}
      %td.diff-line-num.header{":class" => "lineCssClass(line)", "v-if" => "line.isHeader"}
      %td.diff-line-num.header{":class" => "lineCssClass(line)", "v-if" => "line.isHeader"}
      %td.line_content.header{":class" => "lineCssClass(line)", "v-if" => "line.isHeader"}
        %strong {{{line.richText}}}
        %button.btn{ "@click" => "handleSelected(file, line.id, line.section)" }
          {{line.buttonTitle}}