Add latest changes from gitlab-org/gitlab@master

3 files changed, 16 insertions, 4 deletions

diff --git a/app/assets/javascripts/vue_shared/components/markdown/apply_suggestion.vue b/app/assets/javascripts/vue_shared/components/markdown/apply_suggestion.vue
index f51ec715678..a570abae9d3 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/apply_suggestion.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/apply_suggestion.vue
@@ -12,7 +12,8 @@ export default {
     },
     defaultCommitMessage: {
       type: String,
-      required: true,
+      required: false,
+      default: null,
     },
     batchSuggestionsCount: {
       type: Number,
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 dbbcb8a6424..9638baa1dea 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue
@@ -95,6 +95,11 @@ export default {
       required: false,
       default: false,
     },
+    codeSuggestionsConfig: {
+      type: Object,
+      required: false,
+      default: () => ({}),
+    },
   },
   data() {
     return {
@@ -166,7 +171,7 @@ export default {
     renderMarkdown(markdown) {
       const url = setUrlParams(
         { render_quick_actions: this.supportsQuickActions },
-        joinPaths(window.location.origin, gon.relative_url_root, this.renderMarkdownPath),
+        joinPaths(gon.relative_url_root || window.location.origin, this.renderMarkdownPath),
       );
       return axios.post(url, { text: markdown }).then(({ data }) => data.body);
     },
@@ -235,6 +240,10 @@ export default {
       data-testid="markdown-field"
       :markdown-preview-path="renderMarkdownPath"
       :can-attach-file="!disableAttachments"
+      :can-suggest="codeSuggestionsConfig.canSuggest"
+      :line="codeSuggestionsConfig.line"
+      :lines="codeSuggestionsConfig.lines"
+      :show-suggest-popover="codeSuggestionsConfig.showPopover"
       :textarea-value="markdown"
       :uploads-path="uploadsPath"
       :enable-autocomplete="enableAutocomplete"
@@ -278,6 +287,7 @@ export default {
         :autocomplete-data-sources="autocompleteDataSources"
         :editable="!disabled"
         :disable-attachments="disableAttachments"
+        :code-suggestions-config="codeSuggestionsConfig"
         @initialized="setEditorAsAutofocused"
         @change="updateMarkdownFromContentEditor"
         @keydown="$emit('keydown', $event)"
diff --git a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue
index 6d1cadf15be..4423b26560f 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue
@@ -40,7 +40,8 @@ export default {
     },
     defaultCommitMessage: {
       type: String,
-      required: true,
+      required: false,
+      default: null,
     },
     suggestionsCount: {
       type: Number,
@@ -124,7 +125,7 @@ export default {
           suggestion,
           batchSuggestionsInfo,
           helpPagePath,
-          defaultCommitMessage,
+          defaultCommitMessage: defaultCommitMessage || '',
           suggestionsCount,
           failedToLoadMetadata,
         },