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 /config/initializers | |
| 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 'config/initializers')
| -rw-r--r-- | config/initializers/math_lexer.rb | 2 | ||||
| -rw-r--r-- | config/initializers/plantuml_lexer.rb | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/config/initializers/math_lexer.rb b/config/initializers/math_lexer.rb deleted file mode 100644 index 8a3388a267e..00000000000 --- a/config/initializers/math_lexer.rb +++ /dev/null @@ -1,2 +0,0 @@ -# Touch the lexers so it is registered with Rouge -Rouge::Lexers::Math diff --git a/config/initializers/plantuml_lexer.rb b/config/initializers/plantuml_lexer.rb deleted file mode 100644 index e8a77b146fa..00000000000 --- a/config/initializers/plantuml_lexer.rb +++ /dev/null @@ -1,2 +0,0 @@ -# Touch the lexers so it is registered with Rouge -Rouge::Lexers::Plantuml |