diff options
| author | Phil Hughes <me@iamphill.com> | 2017-11-22 11:00:12 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-11-22 11:00:12 +0000 |
| commit | d7527d73b17e41f949c609380aeffc837b80652e (patch) | |
| tree | 8f465bb688d59063c85e9689241e65137cf6cc96 /spec/javascripts | |
| parent | 0efa7e24f22abd1dc04c165f31e7b77b0eb30ed4 (diff) | |
| parent | 131e74d10dafbf2b781ab5d5517e42a18e20a587 (diff) | |
| download | gitlab-ce-d7527d73b17e41f949c609380aeffc837b80652e.tar.gz | |
Merge branch 'feature_add_mermaid' into 'master'
Add support of Mermaid
Closes #3711
See merge request gitlab-org/gitlab-ce!15107
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/notes_spec.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js index 928a4b461cc..63abac222c4 100644 --- a/spec/javascripts/notes_spec.js +++ b/spec/javascripts/notes_spec.js @@ -4,8 +4,9 @@ import 'autosize'; import '~/gl_form'; import '~/lib/utils/text_utility'; -import '~/render_gfm'; import '~/render_math'; +import '~/render_mermaid'; +import '~/render_gfm'; import '~/notes'; (function() { |