summaryrefslogtreecommitdiff
path: root/config/application.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-01-25 14:14:46 +0100
committerRémy Coutable <remy@rymai.me>2018-01-25 14:14:53 +0100
commit78faa6e3706570b8bf5f8d9f331135080a82679d (patch)
tree0ab6efc82f5527a4af7f5329bd5a8c1fd09cfc63 /config/application.rb
parentd772f52e1ec5848b00fc590606d33645f0799eb5 (diff)
downloadgitlab-ce-78faa6e3706570b8bf5f8d9f331135080a82679d.tar.gz
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb
index ea9a07cbde9..2067428ff62 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -98,10 +98,11 @@ module Gitlab
# Enable the asset pipeline
config.assets.enabled = true
+
# Support legacy unicode file named img emojis, `1F939.png`
config.assets.paths << Gemojione.images_path
- config.assets.paths << "vendor/assets/fonts"
- config.assets.precompile << "*.png"
+ config.assets.paths << "#{config.root}/vendor/assets/fonts"
+
config.assets.precompile << "print.css"
config.assets.precompile << "notify.css"
config.assets.precompile << "mailers/*.css"
@@ -110,7 +111,6 @@ module Gitlab
config.assets.precompile << "xterm/xterm.css"
config.assets.precompile << "performance_bar.css"
config.assets.precompile << "lib/ace.js"
- config.assets.precompile << "vendor/assets/fonts/*"
config.assets.precompile << "test.css"
config.assets.precompile << "locale/**/app.js"