summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-12 08:52:28 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-12 08:52:28 +0000
commitf0450c486c993dc21cf7f617f77a3225e3a6703f (patch)
tree07104ac2f4389e39bb68b713b790a23201d3066c
parent7929fe0598a699162136261694b642eb37cea217 (diff)
parent21a46236e07af5c0e16d700a4b87d565e1b46671 (diff)
downloadgitlab-ce-f0450c486c993dc21cf7f617f77a3225e3a6703f.tar.gz
Merge branch 'rs-add-title-to-emoji' into 'master'
Add title attribute to Emojis in award picker See merge request !2378
-rw-r--r--app/helpers/issues_helper.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index a7080ddfefb..43262d579e9 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -103,9 +103,12 @@ module IssuesHelper
content_tag :div, "",
class: "icon emoji-icon emoji-#{unicode}",
- "data-emoji" => name,
- "data-aliases" => aliases.join(" "),
- "data-unicode-name" => unicode
+ title: name,
+ data: {
+ aliases: aliases.join(' '),
+ emoji: name,
+ unicode_name: unicode
+ }
end
def emoji_author_list(notes, current_user)