summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-12-15 14:11:38 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-12-15 14:11:38 +0000
commit4d1f5837125ffbe363897c8b222536e3e6db8fa5 (patch)
tree231cbd8672324cf0aeae0db291c948adefcfa9fd /config
parentecfa8655de37a84007a72c274b5f9662c02499ef (diff)
parent2d170a20dc4cd3423ac7994c797cae8fbed263ba (diff)
downloadgitlab-ce-4d1f5837125ffbe363897c8b222536e3e6db8fa5.tar.gz
Merge branch 'katex-math' into 'master'
Render math in Asciidoc and Markdown with KaTeX using code blocks Closes #13690 and #13180 See merge request !8003
Diffstat (limited to 'config')
-rw-r--r--config/application.rb2
-rw-r--r--config/initializers/math_lexer.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index 0aa2873f94a..fbf50df2850 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -85,6 +85,8 @@ module Gitlab
config.assets.precompile << "print.css"
config.assets.precompile << "notify.css"
config.assets.precompile << "mailers/*.css"
+ config.assets.precompile << "katex.css"
+ config.assets.precompile << "katex.js"
config.assets.precompile << "graphs/graphs_bundle.js"
config.assets.precompile << "users/users_bundle.js"
config.assets.precompile << "network/network_bundle.js"
diff --git a/config/initializers/math_lexer.rb b/config/initializers/math_lexer.rb
new file mode 100644
index 00000000000..8a3388a267e
--- /dev/null
+++ b/config/initializers/math_lexer.rb
@@ -0,0 +1,2 @@
+# Touch the lexers so it is registered with Rouge
+Rouge::Lexers::Math