diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 00:09:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 00:09:20 +0300 |
commit | 06be418a7cd98a1c87c41ba43cca1ce9acbe885e (patch) | |
tree | 218a068630ae2dbe87b32a67a7f2b77d631e0db9 /app/assets/javascripts/diffs/components | |
parent | eb1f5a3e087b7d6a3e85f2724b5a475cc9d9d37d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/diffs/components')
-rw-r--r-- | app/assets/javascripts/diffs/components/diff_file_row.vue | 7 | ||||
-rw-r--r-- | app/assets/javascripts/diffs/components/tree_list.vue | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_file_row.vue b/app/assets/javascripts/diffs/components/diff_file_row.vue index 5aaed0d40db..15e63a1c9ca 100644 --- a/app/assets/javascripts/diffs/components/diff_file_row.vue +++ b/app/assets/javascripts/diffs/components/diff_file_row.vue @@ -5,12 +5,14 @@ */ import FileRow from '~/vue_shared/components/file_row.vue'; import FileRowStats from './file_row_stats.vue'; +import ChangedFileIcon from '~/vue_shared/components/changed_file_icon.vue'; export default { name: 'DiffFileRow', components: { FileRow, FileRowStats, + ChangedFileIcon, }, props: { file: { @@ -31,7 +33,8 @@ export default { </script> <template> - <file-row :file="file" :hide-file-stats="hideFileStats" v-bind="$attrs" v-on="$listeners"> - <file-row-stats v-if="showFileRowStats" :file="file" /> + <file-row :file="file" v-bind="$attrs" v-on="$listeners"> + <file-row-stats v-if="showFileRowStats" :file="file" class="mr-1" /> + <changed-file-icon :file="file" :size="16" /> </file-row> </template> diff --git a/app/assets/javascripts/diffs/components/tree_list.vue b/app/assets/javascripts/diffs/components/tree_list.vue index 1eac3430a20..eca9091f92f 100644 --- a/app/assets/javascripts/diffs/components/tree_list.vue +++ b/app/assets/javascripts/diffs/components/tree_list.vue @@ -95,8 +95,6 @@ export default { :file="file" :level="0" :hide-file-stats="hideFileStats" - :hide-extra-on-tree="true" - :show-changed-icon="true" :file-row-component="$options.DiffFileRow" @toggleTreeOpen="toggleTreeOpen" @clickFile="scrollToFile" |