diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2018-01-18 11:40:06 +0000 |
---|---|---|
committer | Tiago <tiagonbotelho@hotmail.com> | 2018-01-19 14:14:20 +0000 |
commit | fb26d040f06061015d515383e4777d001a171186 (patch) | |
tree | d212ad4b7738d515fd0580177f2ff0b7f47b21f3 | |
parent | 7c30d486e4b5a2087e783927803e3179532c9696 (diff) | |
download | gitlab-ce-fb26d040f06061015d515383e4777d001a171186.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 41942c04a4e..943068cf36d 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 |