summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-04-26 11:59:17 -0700
committerStan Hu <stanhu@gmail.com>2019-04-26 12:16:41 -0700
commit916d0a7e85afcb8b70330cc95b86fb3ccb4b909c (patch)
tree5b268b4fb80b5b087815964ef6965e9943d8dcab
parent265b789476479c29ea88db174aca1d80ddf24358 (diff)
downloadgitlab-ce-sh-fix-mermaid-flowchart-rendering.tar.gz
Enable HTML tags to make Mermaid render dotted linessh-fix-mermaid-flowchart-rendering
Flowcharts appear to be missing styles if HTML tags are disabled for flowchart labels. They appear to disabled because some browsers (https://github.com/knsv/mermaid/issues/303) may omit labels if they are present, but in testing with Microsoft Edge this doesn't appear to be an issue now. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60869
-rw-r--r--app/assets/javascripts/behaviors/markdown/render_mermaid.js2
-rw-r--r--changelogs/unreleased/sh-fix-mermaid-flowchart-rendering.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/behaviors/markdown/render_mermaid.js b/app/assets/javascripts/behaviors/markdown/render_mermaid.js
index 798114b4b0b..536ba7464f7 100644
--- a/app/assets/javascripts/behaviors/markdown/render_mermaid.js
+++ b/app/assets/javascripts/behaviors/markdown/render_mermaid.js
@@ -31,7 +31,7 @@ export default function renderMermaid($els) {
// mermaidAPI options
theme: 'neutral',
flowchart: {
- htmlLabels: false,
+ htmlLabels: true,
},
});
diff --git a/changelogs/unreleased/sh-fix-mermaid-flowchart-rendering.yml b/changelogs/unreleased/sh-fix-mermaid-flowchart-rendering.yml
new file mode 100644
index 00000000000..4cdcb6fe1fd
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-mermaid-flowchart-rendering.yml
@@ -0,0 +1,5 @@
+---
+title: Enable HTML tags to make Mermaid render dotted lines
+merge_request: 27770
+author:
+type: fixed