Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

2 files changed, 10 insertions, 12 deletions

diff --git a/app/assets/javascripts/content_editor/extensions/paste_markdown.js b/app/assets/javascripts/content_editor/extensions/paste_markdown.js
index f87e4d8d1dd..848c4c12a9a 100644
--- a/app/assets/javascripts/content_editor/extensions/paste_markdown.js
+++ b/app/assets/javascripts/content_editor/extensions/paste_markdown.js
@@ -3,13 +3,7 @@ import { Plugin, PluginKey } from 'prosemirror-state';
 import { __ } from '~/locale';
 import { VARIANT_DANGER } from '~/flash';
 import createMarkdownDeserializer from '../services/gl_api_markdown_deserializer';
-import {
-  ALERT_EVENT,
-  LOADING_CONTENT_EVENT,
-  LOADING_SUCCESS_EVENT,
-  LOADING_ERROR_EVENT,
-  EXTENSION_PRIORITY_HIGHEST,
-} from '../constants';
+import { ALERT_EVENT, EXTENSION_PRIORITY_HIGHEST } from '../constants';
 import CodeBlockHighlight from './code_block_highlight';
 import Diagram from './diagram';
 import Frontmatter from './frontmatter';
@@ -34,10 +28,8 @@ export default Extension.create({
         const { renderMarkdown, eventHub } = options;
         const deserializer = createMarkdownDeserializer({ render: renderMarkdown });
 
-        eventHub.$emit(LOADING_CONTENT_EVENT);
-
         deserializer
-          .deserialize({ schema: editor.schema, content: markdown })
+          .deserialize({ schema: editor.schema, markdown })
           .then(({ document }) => {
             if (!document) {
               return;
@@ -48,14 +40,12 @@ export default Extension.create({
 
             tr.replaceWith(selection.from - 1, selection.to, document.content);
             view.dispatch(tr);
-            eventHub.$emit(LOADING_SUCCESS_EVENT);
           })
           .catch(() => {
             eventHub.$emit(ALERT_EVENT, {
               message: __('An error occurred while pasting text in the editor. Please try again.'),
               variant: VARIANT_DANGER,
             });
-            eventHub.$emit(LOADING_ERROR_EVENT);
           });
 
         return true;
diff --git a/app/assets/javascripts/content_editor/extensions/sourcemap.js b/app/assets/javascripts/content_editor/extensions/sourcemap.js
index f9de71f601b..54d69d83188 100644
--- a/app/assets/javascripts/content_editor/extensions/sourcemap.js
+++ b/app/assets/javascripts/content_editor/extensions/sourcemap.js
@@ -1,9 +1,11 @@
 import { Extension } from '@tiptap/core';
+import Audio from './audio';
 import Blockquote from './blockquote';
 import Bold from './bold';
 import BulletList from './bullet_list';
 import Code from './code';
 import CodeBlockHighlight from './code_block_highlight';
+import Diagram from './diagram';
 import FootnoteReference from './footnote_reference';
 import FootnoteDefinition from './footnote_definition';
 import Frontmatter from './frontmatter';
@@ -25,17 +27,21 @@ import Table from './table';
 import TableCell from './table_cell';
 import TableHeader from './table_header';
 import TableRow from './table_row';
+import TableOfContents from './table_of_contents';
+import Video from './video';
 
 export default Extension.create({
   addGlobalAttributes() {
     return [
       {
         types: [
+          Audio.name,
           Bold.name,
           Blockquote.name,
           BulletList.name,
           Code.name,
           CodeBlockHighlight.name,
+          Diagram.name,
           FootnoteReference.name,
           FootnoteDefinition.name,
           Frontmatter.name,
@@ -56,6 +62,8 @@ export default Extension.create({
           TableCell.name,
           TableHeader.name,
           TableRow.name,
+          TableOfContents.name,
+          Video.name,
           ...HTMLNodes.map((htmlNode) => htmlNode.name),
         ],
         attributes: {