diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-03 14:10:49 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-03 14:10:49 +0000 |
| commit | b5103a83a8574936721250997e75ab9a6855d00a (patch) | |
| tree | df9ccf22dda30ef2c81b084295e1043823269486 | |
| parent | 6689224a90f3d2500be5d927ea1ed9656fc7b1b6 (diff) | |
| parent | 535d9306c1f3d862e749aba2672e0bc6622e90ae (diff) | |
| download | gitlab-ce-b5103a83a8574936721250997e75ab9a6855d00a.tar.gz | |
Merge branch 'ui/emoji' into 'master'
UI: Award emoji tweaks
Before:
After:
See merge request !1960
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 1 | ||||
| -rw-r--r-- | app/helpers/issues_helper.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 51d8e5b4657..9313fa4795a 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -158,6 +158,7 @@ min-width: 214px; > li { + cursor: pointer; margin: 5px; } } diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 493f370d9a9..25befd654d4 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -96,7 +96,7 @@ module IssuesHelper def emoji_author_list(notes, current_user) list = notes.map do |note| - note.author == current_user ? "me" : note.author.username + note.author == current_user ? "me" : note.author.name end list.join(", ") |