diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-06-25 15:48:12 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-06-29 14:53:09 -0600 |
| commit | f31f78cea32b1650d5cb0a7784a28848b8446e89 (patch) | |
| tree | 07996228b1a7fd9e3335a0be680a55c6dc010997 /lib/tasks/gemojione.rake | |
| parent | 84113d7e725dcf6f9a3945853475f0cede957fec (diff) | |
| download | gitlab-ce-f31f78cea32b1650d5cb0a7784a28848b8446e89.tar.gz | |
Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.update-gemoji
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.
Also fix the Rake task and update gemojione to 2.6.1. This adds the EmojiOne Spring update.
Changelog: https://github.com/jonathanwiesel/gemojione/blob/master/CHANGELOG.md
Diffstat (limited to 'lib/tasks/gemojione.rake')
| -rw-r--r-- | lib/tasks/gemojione.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/gemojione.rake b/lib/tasks/gemojione.rake index 030ee8bafcb..e930ace1041 100644 --- a/lib/tasks/gemojione.rake +++ b/lib/tasks/gemojione.rake @@ -13,7 +13,7 @@ namespace :gemojione do aliases[real_name] << alias_name end - AwardEmoji.emojis.map do |name, emoji_hash| + Gitlab::AwardEmoji.emojis.map do |name, emoji_hash| fpath = File.join(dir, "#{emoji_hash['unicode']}.png") digest = Digest::SHA256.file(fpath).hexdigest |