app/views/projects/merge_requests/conflicts/_commit_stats.html.haml


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20

.content-block.oneline-block.files-changed{"v-if" => "!isLoading && !hasError"}
  .inline-parallel-buttons
    .btn-group
      %a.btn{ |
        ":class" => "{'active': !isParallel}", |
        "@click" => "handleViewTypeChange('inline')"}
        Inline
      %a.btn{ |
        ":class" => "{'active': isParallel}", |
        "@click" => "handleViewTypeChange('parallel')"}
        Side-by-side

  .js-toggle-container
    .commit-stat-summary
      Showing
      %strong.cred {{conflictsCount}} {{conflictsData.conflictsText}}
      between
      %strong {{conflictsData.source_branch}}
      and
      %strong {{conflictsData.target_branch}}