blob: e6205f24ae6c96ae0709395314496b537a3ecdab (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
|
.content-block.oneline-block.files-changed{ "v-if" => "!isLoading && !hasError" }
.inline-parallel-buttons{ "v-if" => "showDiffViewTypeSwitcher" }
.btn-group
%button.btn{ ":class" => "{'active': !isParallel}", "@click" => "handleViewTypeChange('inline')" }
Inline
%button.btn{ ":class" => "{'active': isParallel}", "@click" => "handleViewTypeChange('parallel')" }
Side-by-side
.js-toggle-container
.commit-stat-summary
Showing
%strong.cred {{conflictsCountText}}
between
%strong.ref-name {{conflictsData.sourceBranch}}
and
%strong.ref-name {{conflictsData.targetBranch}}
|
