diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-11-21 09:39:57 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-11-21 09:39:57 +0000 |
| commit | eb5333970c0f2247e86dc5b834a231796236e7c2 (patch) | |
| tree | 2c50462e526357e6e768c70f248165aff0f076c7 /app/assets/javascripts/vue_shared | |
| parent | 3d67018c16756d548b0a891bb118d2ef215355cb (diff) | |
| download | gitlab-ce-eb5333970c0f2247e86dc5b834a231796236e7c2.tar.gz | |
Backport ability to enable/disable file attachments in issuable form
Diffstat (limited to 'app/assets/javascripts/vue_shared')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/field.vue | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/toolbar.vue | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue index a873e00d0f3..ee50ce27c3d 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/field.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue @@ -25,6 +25,11 @@ type: String, required: false, }, + canAttachFile: { + type: Boolean, + required: false, + default: true, + }, }, data() { return { @@ -129,6 +134,7 @@ <markdown-toolbar :markdown-docs-path="markdownDocsPath" :quick-actions-docs-path="quickActionsDocsPath" + :can-attach-file="canAttachFile" /> </div> </div> diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue index 65fe7bbd94e..ea2509d2839 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue @@ -9,6 +9,11 @@ type: String, required: false, }, + canAttachFile: { + type: Boolean, + required: false, + default: true, + }, }, }; </script> @@ -41,7 +46,10 @@ are supported </template> </div> - <span class="uploading-container"> + <span + v-if="canAttachFile" + class="uploading-container" + > <span class="uploading-progress-container hide"> <i class="fa fa-file-image-o toolbar-button-icon" |