Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 1 deletions

diff --git a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue
index 8bf71a481bd..b6c16e9f306 100644
--- a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue
+++ b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue
@@ -1,4 +1,5 @@
 <script>
+import CommentTemplatesDropdown from '~/vue_shared/components/markdown/comment_templates_dropdown.vue';
 import trackUIControl from '../services/track_ui_control';
 import ToolbarButton from './toolbar_button.vue';
 import ToolbarAttachmentButton from './toolbar_attachment_button.vue';
@@ -13,6 +14,11 @@ export default {
     ToolbarTableButton,
     ToolbarAttachmentButton,
     ToolbarMoreDropdown,
+    CommentTemplatesDropdown,
+  },
+  inject: {
+    newCommentTemplatePath: { default: null },
+    tiptapEditor: { default: null },
   },
   props: {
     supportsQuickActions: {
@@ -30,6 +36,9 @@ export default {
     trackToolbarControlExecution({ contentType, value }) {
       trackUIControl({ property: contentType, value });
     },
+    insertSavedReply(savedReply) {
+      this.tiptapEditor.chain().focus().pasteContent(savedReply).run();
+    },
   },
 };
 </script>
@@ -131,11 +140,16 @@ export default {
           data-testid="quick-actions"
           content-type="quickAction"
           icon-name="quick-actions"
-          class="gl-display-none gl-sm-display-inline gl-mr-1!"
+          class="gl-display-none gl-sm-display-inline"
           editor-command="insertQuickAction"
           :label="__('Add a quick action')"
           @execute="trackToolbarControlExecution"
         />
+        <comment-templates-dropdown
+          v-if="newCommentTemplatePath"
+          :new-comment-template-path="newCommentTemplatePath"
+          @select="insertSavedReply"
+        />
         <toolbar-more-dropdown data-testid="more" @execute="trackToolbarControlExecution" />
       </div>
     </div>