Add latest changes from gitlab-org/security/gitlab@13-9-stable-ee

3 files changed, 10 insertions, 5 deletions

diff --git a/changelogs/unreleased/mermaid-8-9-2.yml b/changelogs/unreleased/mermaid-8-9-2.yml
new file mode 100644
index 00000000000..7cb4731fa33
--- /dev/null
+++ b/changelogs/unreleased/mermaid-8-9-2.yml
@@ -0,0 +1,5 @@
+---
+title: Update mermaid to version 8.9.2
+merge_request:
+author:
+type: security
diff --git a/package.json b/package.json
index 66fc0668431..fa0d68ba7ba 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "lodash": "^4.17.20",
     "marked": "^0.3.12",
     "mathjax": "3",
-    "mermaid": "^8.9.0",
+    "mermaid": "^8.9.2",
     "minimatch": "^3.0.4",
     "monaco-editor": "^0.20.0",
     "monaco-editor-webpack-plugin": "^1.9.0",
diff --git a/yarn.lock b/yarn.lock
index d3b92e7e2f3..3cbe49784bf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8200,10 +8200,10 @@ merge2@^1.2.3:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
   integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
 
-mermaid@^8.9.0:
-  version "8.9.0"
-  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.9.0.tgz#e569517863ab903aa5389cd746b68ca958a8ca7c"
-  integrity sha512-J582tyE1vkdNu4BGgfwXnFo4Mu6jpuc4uK96mIenavaak9kr4T5gaMmYCo/7edwq/vTBkx/soZ5LcJo5WXZ1BQ==
+mermaid@^8.9.2:
+  version "8.9.2"
+  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.9.2.tgz#40bb2052cc6c4feaf5d93a5e527a8d06d0bacea7"
+  integrity sha512-XWEaraDRDlHZexdeHSSr/MH4VJAOksRSPudchi69ecZJ7IUjjlzHsg32n4ZwJUh6lFO+NMYLHwHNNYUyxIjGPg==
   dependencies:
     "@braintree/sanitize-url" "^3.1.0"
     d3 "^5.7.0"