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 /app | |
| 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 'app')
| -rw-r--r-- | app/assets/javascripts/behaviors/markdown/render_mermaid.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/behaviors/markdown/render_mermaid.js b/app/assets/javascripts/behaviors/markdown/render_mermaid.js index 56f64f934a1..720f30e18e6 100644 --- a/app/assets/javascripts/behaviors/markdown/render_mermaid.js +++ b/app/assets/javascripts/behaviors/markdown/render_mermaid.js @@ -17,7 +17,7 @@ import flash from '~/flash'; export default function renderMermaid($els) { if (!$els.length) return; - import(/* webpackChunkName: 'mermaid' */ 'blackst0ne-mermaid') + import(/* webpackChunkName: 'mermaid' */ 'mermaid') .then(mermaid => { mermaid.initialize({ // mermaid core options |