summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-27 10:05:29 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-27 10:05:29 +0000
commit160f5ee3c5d02798ea5f77a2f8ccc0677210bbb3 (patch)
tree7ca8ed12e228aa61fc5ae1539afc88ca4b8f20b5
parent942e58ee31a6650d6b1011c4d4ebb01eae0a7e67 (diff)
downloadgitlab-ce-160f5ee3c5d02798ea5f77a2f8ccc0677210bbb3.tar.gz
Add latest changes from gitlab-org/security/gitlab@13-10-stable-ee
-rw-r--r--changelogs/unreleased/mermaid-8-9-2.yml5
-rw-r--r--package.json2
-rw-r--r--yarn.lock8
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 978b9079aaa..9e47dcdea0d 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,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 6e636ca1729..2c33f8ffd5b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8194,10 +8194,10 @@ merge2@^1.3.0:
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-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"