diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-31 15:13:32 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-03 08:34:36 -0500 |
| commit | b90f83e93319d54d558b29838d7453444f3fcf11 (patch) | |
| tree | 19d03ba7b9e9ae5c14454ffa5f01e0cb2e6bba60 /app/views/events | |
| parent | 2faf955c241ce7e99111f8fd0cae2e7ab6167e5a (diff) | |
| download | gitlab-ce-b90f83e93319d54d558b29838d7453444f3fcf11.tar.gz | |
Start adding profile icons
Diffstat (limited to 'app/views/events')
| -rw-r--r-- | app/views/events/_event.html.haml | 5 | ||||
| -rw-r--r-- | app/views/events/event/_common.html.haml | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml index a0bd14df209..bf7a9af99cd 100644 --- a/app/views/events/_event.html.haml +++ b/app/views/events/_event.html.haml @@ -3,13 +3,14 @@ .event-item-timestamp #{time_ago_with_tooltip(event.created_at)} - = author_avatar(event, size: 40) - - if event.created_project? + = custom_icon("icon_status_open") = render "events/event/created_project", event: event - elsif event.push? + = custom_icon("icon_commit") = render "events/event/push", event: event - elsif event.commented? + = custom_icon("comment_o") = render "events/event/note", event: event - else = render "events/event/common", event: event diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml index 2fb6b5647da..0d230e3f3f2 100644 --- a/app/views/events/event/_common.html.haml +++ b/app/views/events/event/_common.html.haml @@ -1,5 +1,13 @@ +- if event.target + - if event.target_type == "MergeRequest" + - if event.action_name == "opened" + = custom_icon("icon_status_open") + - elsif event.action_name == "closed" + = custom_icon("icon_status_closed") + - else + = custom_icon("code_fork") + .event-title - %span.author_name= link_to_author event %span{ class: event.action_name } - if event.target = event.action_name |