diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-07-13 08:43:42 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-07-18 10:40:16 -0600 |
| commit | 6a06c5cfb92d7d4e390e63104fd42d24a9159048 (patch) | |
| tree | c4c2697d47e403699fa973f9f5bc795238f51ac3 /config/application.rb | |
| parent | 08264f4334ff48d1274f066cd5b03455bc4befdf (diff) | |
| download | gitlab-ce-6a06c5cfb92d7d4e390e63104fd42d24a9159048.tar.gz | |
Upgrade Gemojione from 2.6.1 to 3.0.1.
This adds the 2016 emoji as well as support for using SVG images instead of PNGs.
It also fixes a number of incorrectly categorized emoji and other minor issues.
Upgrade Rake task for Gemojione 3.0.0 and generate sprites.
Upgrade aliases.json by pulling down index.json from the gemojione repository and running the generate_aliases.rb file.
Changelog: https://github.com/jonathanwiesel/gemojione/blob/master/CHANGELOG.md#v301-2016-07-16
For the specific emoji added to the Unicode standard, see: http://emojione.com/releases/2.2.4/
Huge kudos to Jonathan Wiesel (@jonathanwiesel) for his work on the gemojione gem!
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 5f7b6a3c049..50cc4235eda 100644 --- a/config/application.rb +++ b/config/application.rb @@ -76,7 +76,7 @@ module Gitlab # Enable the asset pipeline config.assets.enabled = true - config.assets.paths << Gemojione.index.images_path + config.assets.paths << Gemojione.images_path config.assets.precompile << "*.png" config.assets.precompile << "print.css" config.assets.precompile << "notify.css" |