diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-19 08:11:02 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-19 08:11:02 +0000 |
| commit | ad12f11f3ed81637b4d72ce9e494fdbd1f26b1bb (patch) | |
| tree | 3097d416524866e13efc21bbb9e1c441cac0a9f9 /config | |
| parent | cb0b7de48267abee85d39571ae55a0e988cc21eb (diff) | |
| parent | 20fcc5d6f602354fe9d4c1c811496798a053f7ba (diff) | |
| download | gitlab-ce-ad12f11f3ed81637b4d72ce9e494fdbd1f26b1bb.tar.gz | |
Merge branch 'rs-emoji' into 'master'
Update Gemojione for new hotness :sparkles:
Before | After
------ | -----
 | 
See merge request !2800
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb index 0d596ed22f5..b905f1a3e90 100644 --- a/config/application.rb +++ b/config/application.rb @@ -45,8 +45,8 @@ module Gitlab # Enable the asset pipeline config.assets.enabled = true - config.assets.paths << Emoji.images_path - config.assets.precompile << "emoji/*.png" + config.assets.paths << Gemojione.index.images_path + config.assets.precompile << "*.png" config.assets.precompile << "print.css" # Version of your assets, change this if you want to expire all your assets |