diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-12-24 11:24:03 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-12-24 11:24:03 +0000 |
| commit | e622259d5be95ede9b4f52b0e654cdf0a7a4323f (patch) | |
| tree | 5e9138018dbc3518749af62c729a8da8ea1a6733 /app/views | |
| parent | 75c3a2f89b52c7981326693b73b0ad8055a551e8 (diff) | |
| parent | 09c5968fa3f94152b5f2767fded6adbd7ddc7032 (diff) | |
| download | gitlab-ce-e622259d5be95ede9b4f52b0e654cdf0a7a4323f.tar.gz | |
Merge branch 'emoji-picker-fix' into 'master'
Emoji picker: better alias handling
related to https://gitlab.com/gitlab-org/gitlab-ce/issues/3576
See merge request !2198
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/votes/_votes_block.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/votes/_votes_block.html.haml b/app/views/votes/_votes_block.html.haml index 8c660ba16cc..829f1664fba 100644 --- a/app/views/votes/_votes_block.html.haml +++ b/app/views/votes/_votes_block.html.haml @@ -16,14 +16,14 @@ %ul - emojis.each do |emoji| %li - = emoji_icon(emoji["name"], emoji["unicode"]) + = emoji_icon(emoji["name"], emoji["unicode"], emoji["aliases"]) - if current_user :coffeescript post_emoji_url = "#{award_toggle_namespace_project_notes_path(@project.namespace, @project)}" noteable_type = "#{votable.class.name.underscore}" noteable_id = "#{votable.id}" - aliases = #{AwardEmoji::ALIASES.to_json} + aliases = #{AwardEmoji.aliases.to_json} window.awards_handler = new AwardsHandler( post_emoji_url, |