diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-25 15:52:06 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-25 15:52:06 +0000 |
| commit | fd231ff9fb6292c2fd15f71c5329216e67935560 (patch) | |
| tree | 258b204b781cbd08a7de3ad26141780e2cfa873b /app/views | |
| parent | 7d5b51f3877eb209e1215c1154a976bb079b930d (diff) | |
| parent | c79ffa01b49128c609099b7048649082b5e327fb (diff) | |
| download | gitlab-ce-fd231ff9fb6292c2fd15f71c5329216e67935560.tar.gz | |
Merge branch 'revert_votes_back' into 'master'
Revert vote buttons back to issue and MR pages
https://gitlab.com/gitlab-org/gitlab-ce/issues/3672
/cc @dzaporozhets @JobV
See merge request !2206
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 e16187bb42f..ce0a0113403 100644 --- a/app/views/votes/_votes_block.html.haml +++ b/app/views/votes/_votes_block.html.haml @@ -1,5 +1,5 @@ .awards.votes-block - - votable.notes.awards.grouped_awards.each do |emoji, notes| + - awards_sort(votable.notes.awards.grouped_awards).each do |emoji, notes| .award{class: (note_active_class(notes, current_user)), title: emoji_author_list(notes, current_user)} = emoji_icon(emoji) .counter |