diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 13:49:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 13:49:51 +0000 |
commit | 71786ddc8e28fbd3cb3fcc4b3ff15e5962a1c82e (patch) | |
tree | 6a2d93ef3fb2d353bb7739e4b57e6541f51cdd71 /app/assets/javascripts/diffs/components/tree_list.vue | |
parent | a7253423e3403b8c08f8a161e5937e1488f5f407 (diff) | |
download | gitlab-ce-15.9.0-rc42.tar.gz |
Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/diffs/components/tree_list.vue')
-rw-r--r-- | app/assets/javascripts/diffs/components/tree_list.vue | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/tree_list.vue b/app/assets/javascripts/diffs/components/tree_list.vue index abf77fa2ede..8bb1872567c 100644 --- a/app/assets/javascripts/diffs/components/tree_list.vue +++ b/app/assets/javascripts/diffs/components/tree_list.vue @@ -101,7 +101,7 @@ export default { </button> </div> </div> - <div :class="{ 'pt-0 tree-list-blobs': !renderTreeList }" class="tree-list-scroll"> + <div :class="{ 'pt-0 tree-list-blobs': !renderTreeList || search }" class="tree-list-scroll"> <template v-if="filteredTreeList.length"> <file-tree v-for="file in filteredTreeList" @@ -112,6 +112,9 @@ export default { :hide-file-stats="hideFileStats" :file-row-component="$options.DiffFileRow" :current-diff-file-id="currentDiffFileId" + :style="{ '--level': 0 }" + :class="{ 'tree-list-parent': file.tree.length }" + class="gl-relative" @toggleTreeOpen="toggleTreeOpen" @clickFile="(path) => scrollToFile({ path })" /> |