diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-07 02:34:48 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-07 02:34:48 +0000 |
| commit | 0ec62b6c5d686496aa120edd66082af94007ca75 (patch) | |
| tree | fd50989710ca09928c902c933890349a7dc23987 /app/views/award_emoji/_awards_block.html.haml | |
| parent | 55cc28d1ca167b502ef7a2f79b11e75fa559d174 (diff) | |
| parent | 5ea6f4b017ae5cecf431d26bbf69fea524fe9428 (diff) | |
| download | gitlab-ce-0ec62b6c5d686496aa120edd66082af94007ca75.tar.gz | |
Merge branch '26371-native-emojis-v3' into 'master'
Add emoji images - Base Native Unicode Emojis
Closes #26371
See merge request !9569
Diffstat (limited to 'app/views/award_emoji/_awards_block.html.haml')
| -rw-r--r-- | app/views/award_emoji/_awards_block.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml index e3305e21e96..a1ef34dc588 100644 --- a/app/views/award_emoji/_awards_block.html.haml +++ b/app/views/award_emoji/_awards_block.html.haml @@ -4,7 +4,7 @@ %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_state_class(awards, current_user)), data: { placement: "bottom", title: award_user_list(awards, current_user) } } - = emoji_icon(emoji, sprite: false) + = emoji_icon(emoji) %span.award-control-text.js-counter = awards.count |