Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-16 09:09:33 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-16 09:09:33 +0300
commit000087abd5a11442a7e34b0e5f3bf86cb40fa8e4 (patch)
treef928981b150721e7ac15c6c55cd4f558abf94e73 /app/assets/javascripts/repository
parent5de7e7c72a59f8a99c71ec33948a53a64f73d075 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/repository')
-rw-r--r--app/assets/javascripts/repository/components/table/index.vue1
-rw-r--r--app/assets/javascripts/repository/components/table/row.vue6
2 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/repository/components/table/index.vue b/app/assets/javascripts/repository/components/table/index.vue
index c1f350dccd6..5e0ad7acdfd 100644
--- a/app/assets/javascripts/repository/components/table/index.vue
+++ b/app/assets/javascripts/repository/components/table/index.vue
@@ -97,6 +97,7 @@ export default {
:path="entry.flatPath"
:type="entry.type"
:url="entry.webUrl"
+ :mode="entry.mode"
:submodule-tree-url="entry.treeUrl"
:lfs-oid="entry.lfsOid"
:loading-path="loadingPath"
diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue
index d5363016335..615e329f415 100644
--- a/app/assets/javascripts/repository/components/table/row.vue
+++ b/app/assets/javascripts/repository/components/table/row.vue
@@ -66,6 +66,11 @@ export default {
type: String,
required: true,
},
+ mode: {
+ type: String,
+ required: false,
+ default: '',
+ },
type: {
type: String,
required: true,
@@ -140,6 +145,7 @@ export default {
>
<file-icon
:file-name="fullPath"
+ :file-mode="mode"
:folder="isFolder"
:submodule="isSubmodule"
:loading="path === loadingPath"