diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-19 02:57:13 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-19 02:57:13 +0300 |
| commit | a27212ab908d5161f5a75b27c4616c11f497f5d4 (patch) | |
| tree | 1ea443ffcba833a262294c232950c15e8cb682a7 /config | |
| parent | ac828424646e14ec9d2032421c5ada91a8fd7dc9 (diff) | |
| parent | 6a06c5cfb92d7d4e390e63104fd42d24a9159048 (diff) | |
Merge branch 'cs-gemojione-3' into 'master'
Upgrade gemojione to 3.0.0
Upgrades gemojione to 3.0.0, see the Changelog: https://github.com/jonathanwiesel/gemojione/blob/b98aa8b07eef815d4d3f52ff3c8714b28932b0de/CHANGELOG.md#v300-2016-07-12
[Here are all the new 2016 emoji](http://emojione.com/releases/2.2.4/) :tada:
This update has new emoji and more sensical categories.
See merge request !5237
Diffstat (limited to 'config')
| -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" |