diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-05 17:08:35 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-05 17:08:35 +0000 |
| commit | aefb8a1741b58a10832e63c73210b8608c2be753 (patch) | |
| tree | 48d9f59a52c8bf0c102f6e1e4d9ecbf36a6dd025 /lib/tasks | |
| parent | 10855e7fff39dbbea791eb1d3b49bb5fc9263455 (diff) | |
| parent | f31f78cea32b1650d5cb0a7784a28848b8446e89 (diff) | |
| download | gitlab-ce-aefb8a1741b58a10832e63c73210b8608c2be753.tar.gz | |
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
Diffstat (limited to 'lib/tasks')
| -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 |