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


1
2
3
4
5
6
7
8
9
10
11

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

  .js-toggle-container
    .commit-stat-summary
      = _('Showing %{conflict_start}%{conflicts_text}%{strong_end} between %{ref_start}%{source_branch}%{strong_end} and %{ref_start}%{target_branch}%{strong_end}').html_safe % { conflict_start: '<strong class="cred">'.html_safe, ref_start: '<strong class="ref-name">'.html_safe, strong_end: '</strong>'.html_safe, conflicts_text: '{{conflictsCountText}}', source_branch: '{{conflictsData.sourceBranch}}', target_branch: '{{conflictsData.targetBranch}}' }