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

_parallel_view.html.haml « conflicts « merge_requests « projects « views « app - gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
blob: 2e6f67c2eaf867c0d5aa94e255fd0dfb5458c1e1 (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
.files{"v-show" => "isParallel"}
  .diff-file.file-holder.conflict.parallel-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.parallel{"v-for" => "section in file.parallelLines"}
            %template{"v-for" => "line in section"}

              %template{"v-if" => "line.isHeader"}
                %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}}

              %template{"v-if" => "!line.isHeader"}
                %td.diff-line-num.old_line{":class" => class_bindings}
                  {{line.lineNumber}}
                %td.line_content.parallel{":class" => class_bindings}
                  {{{line.richText}}}