diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-01-18 11:40:06 +0000 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-01-18 14:54:05 +0000 |
| commit | 55c27f02a25f97bbe207abb7c19007c6e554b2c5 (patch) | |
| tree | 50d7368f8664dfac26f6c3df956603b6030430f2 | |
| parent | 818eab8051bedf244404c85da21e5ec2af89adfd (diff) | |
| download | gitlab-ce-55c27f02a25f97bbe207abb7c19007c6e554b2c5.tar.gz | |
Merge branch 'sh-fix-mermaid-start-on-load-typo' into 'master'
Fix Mermaid drawings not loading on some browsers
Closes #42052
See merge request gitlab-org/gitlab-ce!16537
(cherry picked from commit 50a649530a53a04d2044f9e4c5502586a7ed0c59)
b1261ad9 Fix Mermaid drawings not loading on some browsers
| -rw-r--r-- | app/assets/javascripts/render_mermaid.js | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-mermaid-start-on-load-typo.yml | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/javascripts/render_mermaid.js b/app/assets/javascripts/render_mermaid.js index b7cde6fb092..31c7a772cf4 100644 --- a/app/assets/javascripts/render_mermaid.js +++ b/app/assets/javascripts/render_mermaid.js @@ -19,7 +19,11 @@ export default function renderMermaid($els) { import(/* webpackChunkName: 'mermaid' */ 'blackst0ne-mermaid').then((mermaid) => { mermaid.initialize({ - loadOnStart: false, + // mermaid core options + mermaid: { + startOnLoad: false, + }, + // mermaidAPI options theme: 'neutral', }); diff --git a/changelogs/unreleased/sh-fix-mermaid-start-on-load-typo.yml b/changelogs/unreleased/sh-fix-mermaid-start-on-load-typo.yml new file mode 100644 index 00000000000..a2d4ade8e54 --- /dev/null +++ b/changelogs/unreleased/sh-fix-mermaid-start-on-load-typo.yml @@ -0,0 +1,5 @@ +--- +title: Fix Mermaid drawings not loading on some browsers +merge_request: +author: +type: fixed |