summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/repository/components/tree_content.vue
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-14 15:07:55 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-14 15:07:55 +0000
commit85e494935a8726dc98bb19ffa584488420e5011e (patch)
tree5acf279dab81a2363e4504a9679c32c16510542b /app/assets/javascripts/repository/components/tree_content.vue
parent4ce0bee95df15c05cdb0d777eba31fe753bc443b (diff)
downloadgitlab-ce-85e494935a8726dc98bb19ffa584488420e5011e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/repository/components/tree_content.vue')
-rw-r--r--app/assets/javascripts/repository/components/tree_content.vue12
1 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/javascripts/repository/components/tree_content.vue b/app/assets/javascripts/repository/components/tree_content.vue
index 949e653fc8f..c30d6f05c6a 100644
--- a/app/assets/javascripts/repository/components/tree_content.vue
+++ b/app/assets/javascripts/repository/components/tree_content.vue
@@ -27,6 +27,11 @@ export default {
required: false,
default: '/',
},
+ loadingPath: {
+ type: String,
+ required: false,
+ default: '',
+ },
},
data() {
return {
@@ -109,7 +114,12 @@ export default {
<template>
<div>
- <file-table :path="path" :entries="entries" :is-loading="isLoadingFiles" />
+ <file-table
+ :path="path"
+ :entries="entries"
+ :is-loading="isLoadingFiles"
+ :loading-path="loadingPath"
+ />
<file-preview v-if="readme" :blob="readme" />
</div>
</template>