diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-11-27 21:40:31 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-11-27 21:40:31 +0000 |
| commit | 25a3a1838ab3224be0b6c658ea16fd1b37135372 (patch) | |
| tree | a29f099879f333db23a41855610f037502c01f33 /app/assets | |
| parent | 8e7e2aeb4f0f9e1e61366a62e41fd15936593cfd (diff) | |
| parent | fab9244c26b3344d9c6d17e69689c9a4a159fb18 (diff) | |
| download | gitlab-ce-25a3a1838ab3224be0b6c658ea16fd1b37135372.tar.gz | |
Merge branch 'backport-disable-autocomplete' into 'master'
Backport disable autocomplete
See merge request gitlab-org/gitlab-ce!15557
Diffstat (limited to 'app/assets')
4 files changed, 28 insertions, 3 deletions
diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue index 4e39d483b31..1f9571ff413 100644 --- a/app/assets/javascripts/issue_show/components/app.vue +++ b/app/assets/javascripts/issue_show/components/app.vue @@ -34,6 +34,11 @@ export default { required: false, default: true, }, + enableAutocomplete: { + type: Boolean, + required: false, + default: true, + }, issuableRef: { type: String, required: true, @@ -240,6 +245,7 @@ export default { :project-namespace="projectNamespace" :show-delete-button="showDeleteButton" :can-attach-file="canAttachFile" + :enable-autocomplete="enableAutocomplete" /> <div v-else> <title-component diff --git a/app/assets/javascripts/issue_show/components/fields/description.vue b/app/assets/javascripts/issue_show/components/fields/description.vue index 4d2ef409bad..52fe4ecd08b 100644 --- a/app/assets/javascripts/issue_show/components/fields/description.vue +++ b/app/assets/javascripts/issue_show/components/fields/description.vue @@ -22,6 +22,11 @@ required: false, default: true, }, + enableAutocomplete: { + type: Boolean, + required: false, + default: true, + }, }, components: { markdownField, @@ -42,7 +47,9 @@ <markdown-field :markdown-preview-path="markdownPreviewPath" :markdown-docs-path="markdownDocsPath" - :can-attach-file="canAttachFile"> + :can-attach-file="canAttachFile" + :enable-autocomplete="enableAutocomplete" + > <textarea id="issue-description" class="note-textarea js-gfm-input js-autosize markdown-area" diff --git a/app/assets/javascripts/issue_show/components/form.vue b/app/assets/javascripts/issue_show/components/form.vue index d61776d480d..0fa19022336 100644 --- a/app/assets/javascripts/issue_show/components/form.vue +++ b/app/assets/javascripts/issue_show/components/form.vue @@ -46,6 +46,11 @@ required: false, default: true, }, + enableAutocomplete: { + type: Boolean, + required: false, + default: true, + }, }, components: { lockedWarning, @@ -89,7 +94,9 @@ :form-state="formState" :markdown-preview-path="markdownPreviewPath" :markdown-docs-path="markdownDocsPath" - :can-attach-file="canAttachFile" /> + :can-attach-file="canAttachFile" + :enable-autocomplete="enableAutocomplete" + /> <edit-actions :form-state="formState" :can-destroy="canDestroy" diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue index ee50ce27c3d..15e3d713448 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/field.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue @@ -30,6 +30,11 @@ required: false, default: true, }, + enableAutocomplete: { + type: Boolean, + required: false, + default: true, + }, }, data() { return { @@ -97,7 +102,7 @@ /* GLForm class handles all the toolbar buttons */ - return new GLForm($(this.$refs['gl-form']), true); + return new GLForm($(this.$refs['gl-form']), this.enableAutocomplete); }, beforeDestroy() { const glForm = $(this.$refs['gl-form']).data('gl-form'); |