summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAndrew Kumanyaev <me@zzet.org>2014-02-06 19:56:47 +0300
committerAndrew Kumanyaev <me@zzet.org>2014-02-06 19:56:47 +0300
commite139cc9e33810203fe3ac298ad6649cdbcd79f87 (patch)
treef34774dd66f68f99c23fa997dfaa0fa4a4b62bb4 /config
parentf7b46fa5fff2b26d8213aeb8619f2212e39f9541 (diff)
downloadgitlab-ce-e139cc9e33810203fe3ac298ad6649cdbcd79f87.tar.gz
Add emoji images to asset load path.
Diffstat (limited to 'config')
-rw-r--r--config/application.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb
index 88759ce7cf3..c53257090cf 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -62,7 +62,9 @@ module Gitlab
# Enable the asset pipeline
config.assets.enabled = true
-
+ config.assets.paths << Emoji.images_path
+ config.assets.precompile << "emoji/*.png"
+
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'