From af4312f1d8dcd2d1de67b60da87563aba1aeb74b Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 1 Sep 2019 06:06:38 -0700
Subject: Update Mermaid to v8.2.6

This fixes a regression where an underscore in labels no
longer worked:
https://github.com/knsv/mermaid/releases
---
 changelogs/unreleased/sh-mermaid-8-2-6.yml | 5 +++++
 package.json                               | 2 +-
 yarn.lock                                  | 8 ++++----
 3 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 changelogs/unreleased/sh-mermaid-8-2-6.yml

diff --git a/changelogs/unreleased/sh-mermaid-8-2-6.yml b/changelogs/unreleased/sh-mermaid-8-2-6.yml
new file mode 100644
index 00000000000..d5cee250385
--- /dev/null
+++ b/changelogs/unreleased/sh-mermaid-8-2-6.yml
@@ -0,0 +1,5 @@
+---
+title: Update Mermaid to v8.2.6
+merge_request: 32502
+author:
+type: fixed
diff --git a/package.json b/package.json
index 3d9e0838893..4244dc2d52b 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "jszip-utils": "^0.0.2",
     "katex": "^0.10.0",
     "marked": "^0.3.12",
-    "mermaid": "^8.2.4",
+    "mermaid": "^8.2.6",
     "monaco-editor": "^0.15.6",
     "monaco-editor-webpack-plugin": "^1.7.0",
     "mousetrap": "^1.4.6",
diff --git a/yarn.lock b/yarn.lock
index 6ab2aa24685..4cf3a9584f1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8116,10 +8116,10 @@ merge2@^1.2.3:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
   integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
 
-mermaid@^8.2.4:
-  version "8.2.4"
-  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.2.4.tgz#52bcd45611fd8552ab9ac4e385d2766a0e38dcf7"
-  integrity sha512-2la1eJhu4n+Uug4zbxFnkETFDJ9U32OY/fRP8g8A1DrRdfT3Er+7CuUSvxfhIDxl+AxSEU4dXdqCiToZAVMCmQ==
+mermaid@^8.2.6:
+  version "8.2.6"
+  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.2.6.tgz#e73f396461a435c39a998819171c2114f59e46e1"
+  integrity sha512-A8y4zW2aXPj8Yw+BkrCkV6fvzhsFWVESV1IkzRjqQ6T/+tzhkz946+bdebCmHqicEJGTncu/U6h8dgjo5pWo6Q==
   dependencies:
     "@braintree/sanitize-url" "^3.1.0"
     d3 "^5.7.0"
-- 
cgit v1.2.1