diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-22 19:34:09 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-22 19:34:09 +0000 |
| commit | a4b8e22f936d97eb4af7433a0c0a0d9990940400 (patch) | |
| tree | 34839f2e0028a506f635a5cde4c9fc8c4a4ff164 /package.json | |
| parent | 9fe46d37930d4e03af3ffc8c24b15a50be533685 (diff) | |
| parent | f247d2b5f1f20f3346021b401c852d5fae783340 (diff) | |
| download | gitlab-ce-a4b8e22f936d97eb4af7433a0c0a0d9990940400.tar.gz | |
Merge branch 'blackst0ne-bump-mermaid' into 'master'
Bump mermaid to 8.0.0-rc.8
Closes #52601, #50105, and #40470
See merge request gitlab-org/gitlab-ce!22509
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index 23747bbfbb2..5b0a92ee7a1 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "autosize": "^4.0.0", "axios": "^0.17.1", "babel-loader": "^8.0.4", - "blackst0ne-mermaid": "^7.1.0-fixed", "bootstrap": "4.1.1", "brace-expansion": "^1.1.8", "cache-loader": "^1.2.2", @@ -71,6 +70,7 @@ "jszip-utils": "^0.0.2", "katex": "^0.9.0", "marked": "^0.3.12", + "mermaid": "^8.0.0-rc.8", "monaco-editor": "^0.14.3", "monaco-editor-webpack-plugin": "^1.5.4", "mousetrap": "^1.4.6", |