Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

16 files changed, 27 insertions, 22 deletions

diff --git a/app/assets/javascripts/behaviors/markdown/marks/bold.js b/app/assets/javascripts/behaviors/markdown/marks/bold.js
index d307edd9fd3..89e373220af 100644
--- a/app/assets/javascripts/behaviors/markdown/marks/bold.js
+++ b/app/assets/javascripts/behaviors/markdown/marks/bold.js
@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 
-import { defaultMarkdownSerializer } from 'prosemirror-markdown';
 import { Bold as BaseBold } from 'tiptap-extensions';
+import { defaultMarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 
 // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter
 export default class Bold extends BaseBold {
diff --git a/app/assets/javascripts/behaviors/markdown/marks/code.js b/app/assets/javascripts/behaviors/markdown/marks/code.js
index ccfe2cf5b8d..68368dec676 100644
--- a/app/assets/javascripts/behaviors/markdown/marks/code.js
+++ b/app/assets/javascripts/behaviors/markdown/marks/code.js
@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 
-import { defaultMarkdownSerializer } from 'prosemirror-markdown';
 import { Code as BaseCode } from 'tiptap-extensions';
+import { defaultMarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 
 // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter
 export default class Code extends BaseCode {
diff --git a/app/assets/javascripts/behaviors/markdown/marks/italic.js b/app/assets/javascripts/behaviors/markdown/marks/italic.js
index dbef10536ab..7dc86102f18 100644
--- a/app/assets/javascripts/behaviors/markdown/marks/italic.js
+++ b/app/assets/javascripts/behaviors/markdown/marks/italic.js
@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 
-import { defaultMarkdownSerializer } from 'prosemirror-markdown';
 import { Italic as BaseItalic } from 'tiptap-extensions';
+import { defaultMarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 
 // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter
 export default class Italic extends BaseItalic {
diff --git a/app/assets/javascripts/behaviors/markdown/marks/link.js b/app/assets/javascripts/behaviors/markdown/marks/link.js
index 1111c51805d..b5e09017d83 100644
--- a/app/assets/javascripts/behaviors/markdown/marks/link.js
+++ b/app/assets/javascripts/behaviors/markdown/marks/link.js
@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 
-import { defaultMarkdownSerializer } from 'prosemirror-markdown';
 import { Link as BaseLink } from 'tiptap-extensions';
+import { defaultMarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 
 // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter
 export default class Link extends BaseLink {
diff --git a/app/assets/javascripts/behaviors/markdown/marks/math.js b/app/assets/javascripts/behaviors/markdown/marks/math.js
index 382bf5c9b5b..ca25ff7d07d 100644
--- a/app/assets/javascripts/behaviors/markdown/marks/math.js
+++ b/app/assets/javascripts/behaviors/markdown/marks/math.js
@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 
-import { defaultMarkdownSerializer } from 'prosemirror-markdown';
 import { Mark } from 'tiptap';
+import { defaultMarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 import { HIGHER_PARSE_RULE_PRIORITY } from '../constants';
 
 // Transforms generated HTML back to GFM for Banzai::Filter::MathFilter
diff --git a/app/assets/javascripts/behaviors/markdown/nodes/blockquote.js b/app/assets/javascripts/behaviors/markdown/nodes/blockquote.js
index bd5868e5524..8b14a04e2fe 100644
--- a/app/assets/javascripts/behaviors/markdown/nodes/blockquote.js
+++ b/app/assets/javascripts/behaviors/markdown/nodes/blockquote.js
@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 
-import { defaultMarkdownSerializer } from 'prosemirror-markdown';
 import { Blockquote as BaseBlockquote } from 'tiptap-extensions';
+import { defaultMarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 
 // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter
 export default class Blockquote extends BaseBlockquote {
diff --git a/app/assets/javascripts/behaviors/markdown/nodes/bullet_list.js b/app/assets/javascripts/behaviors/markdown/nodes/bullet_list.js
index 209e7239998..ef1eafaa419 100644
--- a/app/assets/javascripts/behaviors/markdown/nodes/bullet_list.js
+++ b/app/assets/javascripts/behaviors/markdown/nodes/bullet_list.js
@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 
-import { defaultMarkdownSerializer } from 'prosemirror-markdown';
 import { BulletList as BaseBulletList } from 'tiptap-extensions';
+import { defaultMarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 
 // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter
 export default class BulletList extends BaseBulletList {
diff --git a/app/assets/javascripts/behaviors/markdown/nodes/heading.js b/app/assets/javascripts/behaviors/markdown/nodes/heading.js
index 708da053a2f..29967e61ffa 100644
--- a/app/assets/javascripts/behaviors/markdown/nodes/heading.js
+++ b/app/assets/javascripts/behaviors/markdown/nodes/heading.js
@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 
-import { defaultMarkdownSerializer } from 'prosemirror-markdown';
 import { Heading as BaseHeading } from 'tiptap-extensions';
+import { defaultMarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 
 // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter
 export default class Heading extends BaseHeading {
diff --git a/app/assets/javascripts/behaviors/markdown/nodes/horizontal_rule.js b/app/assets/javascripts/behaviors/markdown/nodes/horizontal_rule.js
index 47a24eae1e8..ee3aa145dc3 100644
--- a/app/assets/javascripts/behaviors/markdown/nodes/horizontal_rule.js
+++ b/app/assets/javascripts/behaviors/markdown/nodes/horizontal_rule.js
@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 
-import { defaultMarkdownSerializer } from 'prosemirror-markdown';
 import { HorizontalRule as BaseHorizontalRule } from 'tiptap-extensions';
+import { defaultMarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 
 // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter
 export default class HorizontalRule extends BaseHorizontalRule {
diff --git a/app/assets/javascripts/behaviors/markdown/nodes/image.js b/app/assets/javascripts/behaviors/markdown/nodes/image.js
index 4cc28c45739..16647d2f96e 100644
--- a/app/assets/javascripts/behaviors/markdown/nodes/image.js
+++ b/app/assets/javascripts/behaviors/markdown/nodes/image.js
@@ -1,8 +1,8 @@
 /* eslint-disable class-methods-use-this */
 
-import { defaultMarkdownSerializer } from 'prosemirror-markdown';
 import { Image as BaseImage } from 'tiptap-extensions';
 import { placeholderImage } from '~/lazy_loader';
+import { defaultMarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 import { HIGHER_PARSE_RULE_PRIORITY } from '../constants';
 
 export default class Image extends BaseImage {
diff --git a/app/assets/javascripts/behaviors/markdown/nodes/list_item.js b/app/assets/javascripts/behaviors/markdown/nodes/list_item.js
index 0f56e89dca6..7204b7c09ba 100644
--- a/app/assets/javascripts/behaviors/markdown/nodes/list_item.js
+++ b/app/assets/javascripts/behaviors/markdown/nodes/list_item.js
@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 
-import { defaultMarkdownSerializer } from 'prosemirror-markdown';
 import { ListItem as BaseListItem } from 'tiptap-extensions';
+import { defaultMarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 
 // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter
 export default class ListItem extends BaseListItem {
diff --git a/app/assets/javascripts/behaviors/markdown/nodes/paragraph.js b/app/assets/javascripts/behaviors/markdown/nodes/paragraph.js
index 93d00f27868..5fd098cd46f 100644
--- a/app/assets/javascripts/behaviors/markdown/nodes/paragraph.js
+++ b/app/assets/javascripts/behaviors/markdown/nodes/paragraph.js
@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 
-import { defaultMarkdownSerializer } from 'prosemirror-markdown';
 import { Node } from 'tiptap';
+import { defaultMarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 
 // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter
 export default class Paragraph extends Node {
diff --git a/app/assets/javascripts/behaviors/markdown/nodes/playable.js b/app/assets/javascripts/behaviors/markdown/nodes/playable.js
index 2b667aba2d6..90cbaf9ef4c 100644
--- a/app/assets/javascripts/behaviors/markdown/nodes/playable.js
+++ b/app/assets/javascripts/behaviors/markdown/nodes/playable.js
@@ -1,8 +1,8 @@
 /* eslint-disable class-methods-use-this */
 /* eslint-disable @gitlab/require-i18n-strings */
 
-import { defaultMarkdownSerializer } from 'prosemirror-markdown';
 import { Node } from 'tiptap';
+import { defaultMarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 
 /**
  * Abstract base class for playable media, like video and audio.
diff --git a/app/assets/javascripts/behaviors/markdown/nodes/text.js b/app/assets/javascripts/behaviors/markdown/nodes/text.js
index 4eab10c9d98..0dc77a12f5c 100644
--- a/app/assets/javascripts/behaviors/markdown/nodes/text.js
+++ b/app/assets/javascripts/behaviors/markdown/nodes/text.js
@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 
-import { defaultMarkdownSerializer } from 'prosemirror-markdown';
 import { Node } from 'tiptap';
+import { defaultMarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 
 export default class Text extends Node {
   get name() {
diff --git a/app/assets/javascripts/behaviors/markdown/serializer.js b/app/assets/javascripts/behaviors/markdown/serializer.js
index b4adf1a413f..a5f97d7748a 100644
--- a/app/assets/javascripts/behaviors/markdown/serializer.js
+++ b/app/assets/javascripts/behaviors/markdown/serializer.js
@@ -1,4 +1,4 @@
-import { MarkdownSerializer } from 'prosemirror-markdown';
+import { MarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 import editorExtensions from './editor_extensions';
 
 const nodes = editorExtensions
diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js
index ac2a4184176..9297b14aac9 100644
--- a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js
+++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js
@@ -1,9 +1,9 @@
 import $ from 'jquery';
-import Cookies from 'js-cookie';
 import { flatten } from 'lodash';
 import Mousetrap from 'mousetrap';
 import Vue from 'vue';
-import { parseBoolean } from '~/lib/utils/common_utils';
+import { getCookie, setCookie, parseBoolean } from '~/lib/utils/common_utils';
+
 import findAndFollowLink from '~/lib/utils/navigation_utility';
 import { refreshCurrentPage, visitUrl } from '~/lib/utils/url_utility';
 import {
@@ -161,10 +161,10 @@ export default class Shortcuts {
   static onTogglePerfBar(e) {
     e.preventDefault();
     const performanceBarCookieName = 'perf_bar_enabled';
-    if (parseBoolean(Cookies.get(performanceBarCookieName))) {
-      Cookies.set(performanceBarCookieName, 'false', { expires: 365, path: '/' });
+    if (parseBoolean(getCookie(performanceBarCookieName))) {
+      setCookie(performanceBarCookieName, 'false', { path: '/' });
     } else {
-      Cookies.set(performanceBarCookieName, 'true', { expires: 365, path: '/' });
+      setCookie(performanceBarCookieName, 'true', { path: '/' });
     }
     refreshCurrentPage();
   }
@@ -172,8 +172,13 @@ export default class Shortcuts {
   static onToggleCanary(e) {
     e.preventDefault();
     const canaryCookieName = 'gitlab_canary';
-    const currentValue = parseBoolean(Cookies.get(canaryCookieName));
-    Cookies.set(canaryCookieName, (!currentValue).toString(), { expires: 365, path: '/' });
+    const currentValue = parseBoolean(getCookie(canaryCookieName));
+    setCookie(canaryCookieName, (!currentValue).toString(), {
+      expires: 365,
+      path: '/',
+      // next.gitlab.com uses a leading period. See https://gitlab.com/gitlab-org/gitlab/-/issues/350186
+      domain: `.${window.location.hostname}`,
+    });
     refreshCurrentPage();
   }