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 /app/assets/javascripts/main.js | |
| 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 'app/assets/javascripts/main.js')
| -rw-r--r-- | app/assets/javascripts/main.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index b7ef1ecd923..d908452399c 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -70,6 +70,7 @@ import './projects_dropdown'; import './projects_list'; import './syntax_highlight'; import './render_math'; +import './render_mermaid'; import './render_gfm'; import './right_sidebar'; import './search'; |