Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 1 deletions

diff --git a/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue b/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue
index 64cc95cc287..b38772d5aa5 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue
@@ -29,6 +29,11 @@ export default {
       type: String,
       required: true,
     },
+    quickActionsDocsPath: {
+      type: String,
+      required: false,
+      default: '',
+    },
     uploadsPath: {
       type: String,
       required: false,
@@ -72,6 +77,11 @@ export default {
       required: false,
       default: false,
     },
+    supportsQuickActions: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
@@ -159,6 +169,7 @@ export default {
       :enable-autocomplete="enableAutocomplete"
       :textarea-value="value"
       :markdown-docs-path="markdownDocsPath"
+      :quick-actions-docs-path="quickActionsDocsPath"
       :uploads-path="uploadsPath"
       :enable-preview="enablePreview"
       class="bordered-box"
@@ -171,7 +182,7 @@ export default {
           :name="formFieldName"
           class="note-textarea js-gfm-input js-autosize markdown-area"
           dir="auto"
-          data-supports-quick-actions="false"
+          :data-supports-quick-actions="supportsQuickActions"
           data-qa-selector="markdown_editor_form_field"
           :aria-label="formFieldAriaLabel"
           :placeholder="formFieldPlaceholder"