diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-03 11:34:04 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-05-03 11:34:04 +0000 |
| commit | cac04fbd777ff992bbd92e9ae3cded01d45b07d0 (patch) | |
| tree | c4dfab128f8bea9544c0b4feda0b06fc4eca13b9 /lib | |
| parent | 50f5f4e4ade31cd96443a76630f56dee3c7cce10 (diff) | |
| parent | a7a3c48bcc76a133cb3faef172d4abc79f62e2c8 (diff) | |
| download | gitlab-ce-cac04fbd777ff992bbd92e9ae3cded01d45b07d0.tar.gz | |
Merge branch 'emoji-button-titles' into 'master'
Added emoji description title to award emoji buttons
Closes #29971
See merge request !10881
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/emoji.rb | 2 | ||||
| -rw-r--r-- | lib/tasks/gemojione.rake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/emoji.rb b/lib/gitlab/emoji.rb index a16d9fc2265..e3e36b35ce9 100644 --- a/lib/gitlab/emoji.rb +++ b/lib/gitlab/emoji.rb @@ -54,7 +54,7 @@ module Gitlab unicode_version: emoji_unicode_version(emoji_name) } - ActionController::Base.helpers.content_tag('gl-emoji', emoji_info['moji'], data: data) + ActionController::Base.helpers.content_tag('gl-emoji', emoji_info['moji'], title: emoji_info['description'], data: data) end end end diff --git a/lib/tasks/gemojione.rake b/lib/tasks/gemojione.rake index 5293f5af12d..b5572a39d30 100644 --- a/lib/tasks/gemojione.rake +++ b/lib/tasks/gemojione.rake @@ -19,6 +19,7 @@ namespace :gemojione do entry = { category: emoji_hash['category'], moji: emoji_hash['moji'], + description: emoji_hash['description'], unicodeVersion: Gitlab::Emoji.emoji_unicode_version(name), digest: hash_digest, } |