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 /app/views/emojis | |
| 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 'app/views/emojis')
| -rw-r--r-- | app/views/emojis/index.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/emojis/index.html.haml b/app/views/emojis/index.html.haml index 8b38b4c2bd4..790d90ad3ee 100644 --- a/app/views/emojis/index.html.haml +++ b/app/views/emojis/index.html.haml @@ -1,5 +1,5 @@ .emoji-menu - = text_field_tag :emoji_search, "", class: "emoji-search search-input form-control", placeholder: "Seach emojis" + = text_field_tag :emoji_search, "", class: "emoji-search search-input form-control", placeholder: "Search emoji" .emoji-menu-content - Gitlab::AwardEmoji.emoji_by_category.each do |category, emojis| %h5.emoji-menu-title |