diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-02-12 15:34:20 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-12 15:34:20 -0500 |
| commit | fe13f58f3e876e3329ca246db737268bf5b15000 (patch) | |
| tree | ba60ea1779c8ce63cf60a7df830cc62c01312e5e /config | |
| parent | f9bf87bbe812a9ea183f1746c0d7bd82cc8423f4 (diff) | |
| download | gitlab-ce-fe13f58f3e876e3329ca246db737268bf5b15000.tar.gz | |
Update Emoji asset path
Now that we're serving assets directly from the Gemojione gem's path,
the images are not in an `emoji/` sub-folder.
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 1e9ec74cdbf..04d0b23d82d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -43,8 +43,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 |