diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-16 11:23:30 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-16 11:23:30 +0000 |
| commit | 3255239b1d183712a821a7243934dd38322ac777 (patch) | |
| tree | 4d6ab44e1baf2e033ceff98a8af8fb3e6de3815f | |
| parent | 08dd9d48876194cb087014fb3ed46c8c86f7052f (diff) | |
| parent | 2c230c82f2630e7e137083523100f1647a8d9e76 (diff) | |
| download | gitlab-ce-3255239b1d183712a821a7243934dd38322ac777.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
| -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 98b2759a8a7..f9f01b66473 100644 --- a/config/application.rb +++ b/config/application.rb @@ -92,6 +92,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" |