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 50a64953) b1261ad9 Fix Mermaid drawings not loading on some browsers

Merge branch 'sh-fix-mermaid-start-on-load-typo' into 'master'
fb26d040 · Jacob Schatz · Tiago · 7c30d486 · fb26d040 · fb26d040
Commit fb26d040 authored Jan 18, 2018 by Jacob Schatz Committed by Tiago Jan 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

render_mermaid.js app/assets/javascripts/render_mermaid.js +5 -1

sh-fix-mermaid-start-on-load-typo.yml changelogs/unreleased/sh-fix-mermaid-start-on-load-typo.yml +5 -0

No files found.
--- 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',
    });


--- a/changelogs/unreleased/sh-fix-mermaid-start-on-load-typo.yml
+++ b/changelogs/unreleased/sh-fix-mermaid-start-on-load-typo.yml
+---
+title: Fix Mermaid drawings not loading on some browsers
+merge_request:
+author:
+type: fixed