diff options
author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-04-25 20:10:20 +0200 |
---|---|---|
committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-05-10 12:03:13 +0200 |
commit | dccf8a9fc8d4dde91942944f6b47387bfb13c380 (patch) | |
tree | 7574eea0adcc0cd46bf3d685fccec0d08c37b252 /app/helpers/issues_helper.rb | |
parent | 4eb16290e4e95c0a9bcf3d01ecc8060d91eec021 (diff) | |
download | gitlab-ce-dccf8a9fc8d4dde91942944f6b47387bfb13c380.tar.gz |
Add tests on Awardables and Award Emoji
Diffstat (limited to 'app/helpers/issues_helper.rb')
-rw-r--r-- | app/helpers/issues_helper.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 38de0b442ca..ac6c6fb25bb 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -131,7 +131,7 @@ module IssuesHelper class: "icon emoji-icon emoji-#{unicode}", title: name, data: data - else + else # Emoji icons displayed separately, used for the awards already given # to an issue or merge request. content_tag :img, "", @@ -145,12 +145,9 @@ module IssuesHelper end def award_user_list(awards, current_user) - list = - awards.map do |award| - award.user == current_user ? "me" : award.user.name - end - - list.join(", ") + awards.map do |award| + award.user == current_user ? 'me' : award.user.name + end.join(', ') end def award_active_class(awards, current_user) |