-
- Downloads
Merge branch 'feature_add_mermaid' into 'master'
Add support of Mermaid Closes #3711 See merge request gitlab-org/gitlab-ce!15107
No related branches found
No related tags found
Showing
- app/assets/javascripts/main.js 1 addition, 0 deletionsapp/assets/javascripts/main.js
- app/assets/javascripts/render_gfm.js 2 additions, 1 deletionapp/assets/javascripts/render_gfm.js
- app/assets/javascripts/render_mermaid.js 30 additions, 0 deletionsapp/assets/javascripts/render_mermaid.js
- changelogs/unreleased/feature_add_mermaid.yml 5 additions, 0 deletionschangelogs/unreleased/feature_add_mermaid.yml
- config/initializers/math_lexer.rb 0 additions, 2 deletionsconfig/initializers/math_lexer.rb
- config/initializers/plantuml_lexer.rb 0 additions, 2 deletionsconfig/initializers/plantuml_lexer.rb
- doc/user/markdown.md 32 additions, 0 deletionsdoc/user/markdown.md
- lib/banzai/filter/mermaid_filter.rb 20 additions, 0 deletionslib/banzai/filter/mermaid_filter.rb
- lib/banzai/filter/syntax_highlight_filter.rb 21 additions, 14 deletionslib/banzai/filter/syntax_highlight_filter.rb
- lib/banzai/pipeline/gfm_pipeline.rb 1 addition, 0 deletionslib/banzai/pipeline/gfm_pipeline.rb
- lib/rouge/lexers/math.rb 0 additions, 9 deletionslib/rouge/lexers/math.rb
- lib/rouge/lexers/plantuml.rb 0 additions, 9 deletionslib/rouge/lexers/plantuml.rb
- package.json 1 addition, 0 deletionspackage.json
- spec/features/markdown_spec.rb 6 additions, 0 deletionsspec/features/markdown_spec.rb
- spec/fixtures/markdown.md.erb 34 additions, 0 deletionsspec/fixtures/markdown.md.erb
- spec/javascripts/notes_spec.js 2 additions, 1 deletionspec/javascripts/notes_spec.js
- spec/lib/banzai/filter/mermaid_filter_spec.rb 12 additions, 0 deletionsspec/lib/banzai/filter/mermaid_filter_spec.rb
- spec/lib/banzai/filter/syntax_highlight_filter_spec.rb 1 addition, 1 deletionspec/lib/banzai/filter/syntax_highlight_filter_spec.rb
- yarn.lock 43 additions, 2 deletionsyarn.lock
app/assets/javascripts/render_mermaid.js
0 → 100644
config/initializers/math_lexer.rb
deleted
100644 → 0
lib/banzai/filter/mermaid_filter.rb
0 → 100644
lib/rouge/lexers/math.rb
deleted
100644 → 0
lib/rouge/lexers/plantuml.rb
deleted
100644 → 0
... | ... | @@ -22,6 +22,7 @@ |
"babel-plugin-transform-define": "^1.2.0", | ||
"babel-preset-latest": "^6.24.0", | ||
"babel-preset-stage-2": "^6.22.0", | ||
"blackst0ne-mermaid": "^7.1.0-fixed", | ||
"bootstrap-sass": "^3.3.6", | ||
"brace-expansion": "^1.1.8", | ||
"compression-webpack-plugin": "^1.0.0", | ||
... | ... |