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/form.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/form.vue')
| -rw-r--r-- | app/assets/javascripts/issue_show/components/form.vue | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/issue_show/components/form.vue b/app/assets/javascripts/issue_show/components/form.vue index 8bb5c86d567..d61776d480d 100644 --- a/app/assets/javascripts/issue_show/components/form.vue +++ b/app/assets/javascripts/issue_show/components/form.vue @@ -41,6 +41,11 @@ required: false, default: true, }, + canAttachFile: { + type: Boolean, + required: false, + default: true, + }, }, components: { lockedWarning, @@ -83,7 +88,8 @@ <description-field :form-state="formState" :markdown-preview-path="markdownPreviewPath" - :markdown-docs-path="markdownDocsPath" /> + :markdown-docs-path="markdownDocsPath" + :can-attach-file="canAttachFile" /> <edit-actions :form-state="formState" :can-destroy="canDestroy" |