Skip to content
Snippets Groups Projects
Commit aefb8a17 authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'update-gemoji' into 'master'

Add lib/gitlab/emoji.rb instead of gitlab_emoji gem and upgrade Gemojione

- No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier. Unless there's a particularly good reason we were using the gem?
- Fixes the Rake task since it broke after all the AwardEmoji changes.
- Update gemojione to 2.6.1.

Spring Update changes! http://emojione.com/releases/#2.2.0

See merge request !4919
parents 10855e7f f31f78ce
No related branches found
No related tags found
1 merge request!4919Add emoji_helper.rb instead of gitlab_emoji gem and upgrade Gemojione
Pipeline #
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment