diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2017-11-23 14:35:50 +0000 |
---|---|---|
committer | Winnie Hellmann <winnie@gitlab.com> | 2017-11-23 14:35:50 +0000 |
commit | e71a9461894d432bcf8d38228446584d294d2303 (patch) | |
tree | 94fb2f14ca9e5a116ec706e8afc77394e303e7d4 /app/assets/javascripts/issue_show/components/app.vue | |
parent | eb2643f2a9eb71c0f463bc8c7ee63358fdbfd6c3 (diff) | |
parent | bbad7b8c5c37d8534a9836016c75425bd2728e41 (diff) | |
download | gitlab-ce-e71a9461894d432bcf8d38228446584d294d2303.tar.gz |
Merge branch '10-2-stable-patch-2' into '10-2-stable'
Prepare 10.2.2 release
See merge request gitlab-org/gitlab-ce!15559
Diffstat (limited to 'app/assets/javascripts/issue_show/components/app.vue')
-rw-r--r-- | app/assets/javascripts/issue_show/components/app.vue | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue index e8ac8d3b5bb..4e39d483b31 100644 --- a/app/assets/javascripts/issue_show/components/app.vue +++ b/app/assets/javascripts/issue_show/components/app.vue @@ -102,6 +102,11 @@ export default { required: false, default: 'issue', }, + canAttachFile: { + type: Boolean, + required: false, + default: true, + }, }, data() { const store = new Store({ @@ -234,6 +239,7 @@ export default { :project-path="projectPath" :project-namespace="projectNamespace" :show-delete-button="showDeleteButton" + :can-attach-file="canAttachFile" /> <div v-else> <title-component |