summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/conflicts/_inline_view.html.haml
blob: 19c7da4b5e39a6a9c1ccbfd2151b76e88ef5e286 (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
.files{"v-show" => "!isParallel"}
  .diff-file.file-holder.conflict.inline-view{"v-for" => "file in conflictsData.files"}
    .file-title
      %i.fa.fa-fw{":class" => "file.iconClass"}
      %strong {{file.filePath}}
      .file-actions
        %a.btn.view-file.btn-file-option{":href" => "file.blobPath"}
          View file @{{conflictsData.shortCommitSha}}

    .diff-content.diff-wrap-lines
      .diff-wrap-lines.code.file-content.js-syntax-highlight
        %table
          %tr.line_holder.diff-inline{"v-for" => "line in file.inlineLines"}
            %template{"v-if" => "!line.isHeader"}
              %td.diff-line-num.new_line{":class" => class_bindings}
                %a {{line.new_line}}
              %td.diff-line-num.old_line{":class" => class_bindings}
                %a {{line.old_line}}
              %td.line_content{":class" => class_bindings}
                {{{line.richText}}}

            %template{"v-if" => "line.isHeader"}
              %td.diff-line-num.header{":class" => class_bindings}
              %td.diff-line-num.header{":class" => class_bindings}
              %td.line_content.header{":class" => class_bindings}
                %strong {{{line.richText}}}
                %button.btn{"@click" => "handleSelected(line.id, line.section)"}
                  {{line.buttonTitle}}