diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-11 00:28:12 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-11 00:28:12 +0000 |
| commit | d2c9137fea1db2551ce6a5bf7e41c749ae572b66 (patch) | |
| tree | dd0558e4d2529efeb556d47626fd3501a3caddc7 /app/views | |
| parent | 0631a1e9e2ad281d460b9183609e9fcef0bf4c6b (diff) | |
| parent | 91905ae3f5a9f755258b770482cd45916ee47fe4 (diff) | |
| download | gitlab-ce-d2c9137fea1db2551ce6a5bf7e41c749ae572b66.tar.gz | |
Merge branch 'prevent_users_from_upvoting_downvoting_emoji' into 'master'
prevent users from being able to both upvote and downvote
See merge request !3495
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/votes/_votes_block.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/votes/_votes_block.html.haml b/app/views/votes/_votes_block.html.haml index 49cfcd53d74..dc249155b92 100644 --- a/app/views/votes/_votes_block.html.haml +++ b/app/views/votes/_votes_block.html.haml @@ -1,6 +1,6 @@ .awards.votes-block - awards_sort(votable.notes.awards.grouped_awards).each do |emoji, notes| - %button.btn.award-control.js-emoji-btn.has-tooltip{class: (note_active_class(notes, current_user)), title: emoji_author_list(notes, current_user), data: {placement: "top"}} + %button.btn.award-control.js-emoji-btn.has-tooltip{class: (note_active_class(notes, current_user)), data: {placement: "top", original_title: emoji_author_list(notes, current_user)}} = emoji_icon(emoji, sprite: false) %span.award-control-text.js-counter = notes.count |