summaryrefslogtreecommitdiff
path: root/config/application.rb
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-12-22 00:11:13 +0000
committerAlfredo Sumaran <alfredo@gitlab.com>2016-12-22 00:11:13 +0000
commitb5a6d56a783b7d31ff5e8e9a62bc0ecae0f360af (patch)
tree3dab8ddcc54cf7678594ee5e4b721454fc84b284 /config/application.rb
parentc7ee5742337c799e7a2bda0d74756b7e51770fca (diff)
parent7afccbd121377c50b64f77ce0aebfeca512f4a7e (diff)
downloadgitlab-ce-b5a6d56a783b7d31ff5e8e9a62bc0ecae0f360af.tar.gz
Merge branch '25896-fix-404-katax-fonts' into 'master'
Resolve "KaTeX fonts 404 on gitlab.com" Closes #25896 See merge request !8228
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index b5d89e9bafd..d36c6d5c92e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -83,6 +83,7 @@ module Gitlab
# Enable the asset pipeline
config.assets.enabled = true
config.assets.paths << Gemojione.images_path
+ config.assets.paths << "vendor/assets/fonts"
config.assets.precompile << "*.png"
config.assets.precompile << "print.css"
config.assets.precompile << "notify.css"
@@ -108,6 +109,7 @@ module Gitlab
config.assets.precompile << "lib/utils/*.js"
config.assets.precompile << "lib/*.js"
config.assets.precompile << "u2f.js"
+ config.assets.precompile << "vendor/assets/fonts/*"
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'