Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/behaviors/markdown/render_mermaid.js

@@ -59,6 +59,14 @@ export default function renderMermaid($els) {
         mermaid.init(undefined, el, id => {
           const svg = document.getElementById(id);
 
+          // As of https://github.com/knsv/mermaid/commit/57b780a0d,
+          // Mermaid will make two init callbacks:one to initialize the
+          // flow charts, and another to initialize the Gannt charts.
+          // Guard against an error caused by double initialization.
+          if (svg.classList.contains('mermaid')) {
+            return;
+          }
+
           svg.classList.add('mermaid');
 
           // pre > code > svg

changelogs/unreleased/sh-update-mermaid.yml

+---
+title: Update Mermaid to 8.1.0
+merge_request: 30036
+author:
+type: fixed

doc/README.md

@@ -54,7 +54,7 @@ GitLab provides solutions for [all the stages of the DevOps lifecycle](https://a
 ![DevOps Stages](img/devops-stages.png)
 
 GitLab is like a top-of-the-line kitchen for making software. As the executive
-chef, you decide what software you want serve. Using your recipe, GitLab handles
+chef, you decide what software you want to serve. Using your recipe, GitLab handles
 all the prep work, cooking, and delivery, so you can turn around orders faster
 than ever.
 

doc/user/project/settings/index.md

@@ -18,7 +18,7 @@ Adjust your project's name, description, avatar, [default branch](../repository/
 
 ![general project settings](img/general_settings.png)
 
-The project description also partially supports [standard markdown](../../markdown.md#standard-markdown). You can use [emphasis](../../markdown.md#emphasis), [links](../../markdown.md#links), and [line-breaks](../../markdown.md#line-breaks) to add more context to the project description.
+The project description also partially supports [standard markdown](../../markdown.md#standard-markdown-and-extensions-in-gitlab). You can use [emphasis](../../markdown.md#emphasis), [links](../../markdown.md#links), and [line-breaks](../../markdown.md#line-breaks) to add more context to the project description.
 
 ### Sharing and permissions
 

package.json

@@ -96,7 +96,7 @@
     "jszip-utils": "^0.0.2",
     "katex": "^0.10.0",
     "marked": "^0.3.12",
-    "mermaid": "^8.0.0",
+    "mermaid": "^8.1.0",
     "monaco-editor": "^0.15.6",
     "monaco-editor-webpack-plugin": "^1.7.0",
     "mousetrap": "^1.4.6",