Add latest changes from gitlab-org/gitlab@master

5 files changed, 0 insertions, 65 deletions

diff --git a/app/assets/javascripts/content_editor/components/toolbar_more_dropdown.vue b/app/assets/javascripts/content_editor/components/toolbar_more_dropdown.vue
index 99ba8c51948..b7f419d5840 100644
--- a/app/assets/javascripts/content_editor/components/toolbar_more_dropdown.vue
+++ b/app/assets/javascripts/content_editor/components/toolbar_more_dropdown.vue
@@ -15,10 +15,6 @@ export default {
       toggleId: uniqueId('dropdown-toggle-btn-'),
       items: [
         {
-          text: __('Comment'),
-          action: () => this.insert('comment'),
-        },
-        {
           text: __('Code block'),
           action: () => this.insert('codeBlock'),
         },
diff --git a/app/assets/javascripts/content_editor/extensions/comment.js b/app/assets/javascripts/content_editor/extensions/comment.js
deleted file mode 100644
index 8e247e552a3..00000000000
--- a/app/assets/javascripts/content_editor/extensions/comment.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Node, textblockTypeInputRule } from '@tiptap/core';
-
-export const commentInputRegex = /^<!--[\s\n]$/;
-
-export default Node.create({
-  name: 'comment',
-  content: 'text*',
-  marks: '',
-  group: 'block',
-  code: true,
-  isolating: true,
-  defining: true,
-
-  parseHTML() {
-    return [
-      {
-        tag: 'comment',
-        preserveWhitespace: 'full',
-        getContent(element, schema) {
-          const node = schema.node('paragraph', {}, [
-            schema.text(
-              element.textContent.replace(/&#x([0-9A-F]{2,4});/gi, (_, code) =>
-                String.fromCharCode(parseInt(code, 16)),
-              ) || ' ',
-            ),
-          ]);
-          return node.content;
-        },
-      },
-    ];
-  },
-
-  renderHTML() {
-    return [
-      'pre',
-      { class: 'gl-p-0 gl-border-0 gl-bg-transparent gl-text-gray-300' },
-      ['span', { class: 'content-editor-comment' }, 0],
-    ];
-  },
-
-  addInputRules() {
-    return [
-      textblockTypeInputRule({
-        find: commentInputRegex,
-        type: this.type,
-      }),
-    ];
-  },
-});
diff --git a/app/assets/javascripts/content_editor/services/create_content_editor.js b/app/assets/javascripts/content_editor/services/create_content_editor.js
index ee1f706ec7e..ebed2038f87 100644
--- a/app/assets/javascripts/content_editor/services/create_content_editor.js
+++ b/app/assets/javascripts/content_editor/services/create_content_editor.js
@@ -10,7 +10,6 @@ import BulletList from '../extensions/bullet_list';
 import Code from '../extensions/code';
 import CodeBlockHighlight from '../extensions/code_block_highlight';
 import ColorChip from '../extensions/color_chip';
-import Comment from '../extensions/comment';
 import DescriptionItem from '../extensions/description_item';
 import DescriptionList from '../extensions/description_list';
 import Details from '../extensions/details';
@@ -112,7 +111,6 @@ export const createContentEditor = ({
     BulletList,
     Code,
     ColorChip,
-    Comment,
     CodeBlockHighlight,
     DescriptionItem,
     DescriptionList,
diff --git a/app/assets/javascripts/content_editor/services/markdown_serializer.js b/app/assets/javascripts/content_editor/services/markdown_serializer.js
index 4dbafd1632d..51eff4d8708 100644
--- a/app/assets/javascripts/content_editor/services/markdown_serializer.js
+++ b/app/assets/javascripts/content_editor/services/markdown_serializer.js
@@ -13,7 +13,6 @@ import DescriptionList from '../extensions/description_list';
 import Details from '../extensions/details';
 import DetailsContent from '../extensions/details_content';
 import DrawioDiagram from '../extensions/drawio_diagram';
-import Comment from '../extensions/comment';
 import Diagram from '../extensions/diagram';
 import Emoji from '../extensions/emoji';
 import Figure from '../extensions/figure';
@@ -52,7 +51,6 @@ import Text from '../extensions/text';
 import Video from '../extensions/video';
 import WordBreak from '../extensions/word_break';
 import {
-  renderComment,
   renderCodeBlock,
   renderHardBreak,
   renderTable,
@@ -134,7 +132,6 @@ const defaultSerializerConfig = {
     }),
     [BulletList.name]: preserveUnchanged(renderBulletList),
     [CodeBlockHighlight.name]: preserveUnchanged(renderCodeBlock),
-    [Comment.name]: renderComment,
     [Diagram.name]: preserveUnchanged(renderCodeBlock),
     [DrawioDiagram.name]: preserveUnchanged({
       render: renderImage,
diff --git a/app/assets/javascripts/content_editor/services/serialization_helpers.js b/app/assets/javascripts/content_editor/services/serialization_helpers.js
index b2cbc9c3fed..17e650644b3 100644
--- a/app/assets/javascripts/content_editor/services/serialization_helpers.js
+++ b/app/assets/javascripts/content_editor/services/serialization_helpers.js
@@ -365,13 +365,6 @@ export function renderPlayable(state, node) {
   renderImage(state, node);
 }
 
-export function renderComment(state, node) {
-  state.write('<!--');
-  state.write(node.textContent);
-  state.write('-->');
-  state.closeBlock(node);
-}
-
 export function renderCodeBlock(state, node) {
   state.write(
     `\`\`\`${