Merge branch 'ui/emoji' into 'master'
UI: Award emoji tweaks Before: ![emoji_before](/uploads/82786924d3cea0313321b9dde0356cd2/emoji_before.png) After: ![emoji_after](/uploads/07e94401701d7a622c3ed5cbaa148244/emoji_after.png) See merge request !1960
This commit is contained in:
commit
b5103a83a8
|
@ -158,6 +158,7 @@
|
||||||
min-width: 214px;
|
min-width: 214px;
|
||||||
|
|
||||||
> li {
|
> li {
|
||||||
|
cursor: pointer;
|
||||||
margin: 5px;
|
margin: 5px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -96,7 +96,7 @@ module IssuesHelper
|
||||||
|
|
||||||
def emoji_author_list(notes, current_user)
|
def emoji_author_list(notes, current_user)
|
||||||
list = notes.map do |note|
|
list = notes.map do |note|
|
||||||
note.author == current_user ? "me" : note.author.username
|
note.author == current_user ? "me" : note.author.name
|
||||||
end
|
end
|
||||||
|
|
||||||
list.join(", ")
|
list.join(", ")
|
||||||
|
|
Loading…
Reference in New Issue