Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-04-10 18:58:41 +0300
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-04-10 18:58:41 +0300
commitc7011c88901c7fa8972f02444bd5e3feef698ca4 (patch)
tree6aee9dbf789e3cb04e3cd192f93b959f981a7229 /app/views/events/event/_push.html.haml
parent9c576cc7e9414e64b4aac0544615e7d5e92c3558 (diff)
Use avatars instead of icons in activity view
Diffstat (limited to 'app/views/events/event/_push.html.haml')
-rw-r--r--app/views/events/event/_push.html.haml14
1 files changed, 9 insertions, 5 deletions
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml
index efdc8764acf..8acee9c1da0 100644
--- a/app/views/events/event/_push.html.haml
+++ b/app/views/events/event/_push.html.haml
@@ -1,10 +1,14 @@
- project = event.project
-.profile-icon
- - if event.action_name == "deleted"
- = custom_icon("trash_o")
- - else
- = custom_icon("icon_commit")
+- if current_path?('dashboard#activity')
+ .system-note-image.user-avatar
+ = author_avatar(event, size: 32)
+- else
+ .system-note-image
+ - if event.action_name == "deleted"
+ = custom_icon("trash_o")
+ - else
+ = custom_icon("icon_commit")
.event-title
%span.author_name= link_to_author event