diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-16 11:23:30 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-16 19:29:14 +0800 |
| commit | 01d2ee546e0afb2b18f5f15a3ace63a3cd82ffcf (patch) | |
| tree | 296557f1a8a7bc7a2bdb4213e3cfdd62b4882d22 /config | |
| parent | 3fa67889122c9969fdc7c3eef0ab0537478136fe (diff) | |
| download | gitlab-ce-01d2ee546e0afb2b18f5f15a3ace63a3cd82ffcf.tar.gz | |
Merge branch 'fix-legacy-emojis-using-unicode-file-name' into 'master'
Restore unicode file name images for legacy img emojis
See merge request !9986
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index cdb93e50e66..c9c830a5b2e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -91,6 +91,8 @@ 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.precompile << "print.css" |