summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-02-03 12:37:37 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-02-03 12:37:37 +0000
commit52ea505126da19717c9137e6bb301f55965eb6e4 (patch)
treeef0c47859906bfc18ce19d3633186edb1102cb80 /config
parent1ca6e99d3850ee39588a9f518ffb53d3fb09e626 (diff)
parentd9e9ad2211c06159914e0183e4842abc16e5666f (diff)
downloadgitlab-ce-52ea505126da19717c9137e6bb301f55965eb6e4.tar.gz
Merge branch 'markdown-plantuml' into 'master'
PlantUML support for Markdown Closes #4048 See merge request !8588
Diffstat (limited to 'config')
-rw-r--r--config/initializers/plantuml_lexer.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/initializers/plantuml_lexer.rb b/config/initializers/plantuml_lexer.rb
new file mode 100644
index 00000000000..e8a77b146fa
--- /dev/null
+++ b/config/initializers/plantuml_lexer.rb
@@ -0,0 +1,2 @@
+# Touch the lexers so it is registered with Rouge
+Rouge::Lexers::Plantuml