diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-12 21:41:15 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-13 20:03:15 +0800 |
| commit | 2979a84b687998af0093cd20679effd3fbfac6f1 (patch) | |
| tree | b550d031199807d5dfc2b199fc559aaafee0caea /app/views/events/event | |
| parent | 2c952f8b735a2ab170458986a6f3b8c9fcedcfc5 (diff) | |
| download | gitlab-ce-2979a84b687998af0093cd20679effd3fbfac6f1.tar.gz | |
Merge branch 'use-avatars-in-activity-view' into 'master'
Use avatars instead of icons in activity view
See merge request !10596
Diffstat (limited to 'app/views/events/event')
| -rw-r--r-- | app/views/events/event/_common.html.haml | 11 | ||||
| -rw-r--r-- | app/views/events/event/_created_project.html.haml | 3 | ||||
| -rw-r--r-- | app/views/events/event/_note.html.haml | 3 | ||||
| -rw-r--r-- | app/views/events/event/_push.html.haml | 6 |
4 files changed, 4 insertions, 19 deletions
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml index af97e9588a5..01e72862114 100644 --- a/app/views/events/event/_common.html.haml +++ b/app/views/events/event/_common.html.haml @@ -1,13 +1,4 @@ -- if event.target - - if event.action_name == "opened" - .profile-icon.open-icon - = custom_icon("icon_status_open") - - elsif event.action_name == "closed" - .profile-icon.closed-icon - = custom_icon("icon_status_closed") - - else - .profile-icon.fork-icon - = custom_icon("icon_code_fork") += icon_for_profile_event(event) .event-title %span.author_name= link_to_author event diff --git a/app/views/events/event/_created_project.html.haml b/app/views/events/event/_created_project.html.haml index fee85c94277..d8e59be57bb 100644 --- a/app/views/events/event/_created_project.html.haml +++ b/app/views/events/event/_created_project.html.haml @@ -1,5 +1,4 @@ -.profile-icon.open-icon - = custom_icon("icon_status_open") += icon_for_profile_event(event) .event-title %span.author_name= link_to_author event diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml index 83709f5e4d0..df4b9562215 100644 --- a/app/views/events/event/_note.html.haml +++ b/app/views/events/event/_note.html.haml @@ -1,5 +1,4 @@ -.profile-icon - = custom_icon("icon_comment_o") += icon_for_profile_event(event) .event-title %span.author_name= link_to_author event diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index efdc8764acf..c0943100ae3 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -1,10 +1,6 @@ - project = event.project -.profile-icon - - if event.action_name == "deleted" - = custom_icon("trash_o") - - else - = custom_icon("icon_commit") += icon_for_profile_event(event) .event-title %span.author_name= link_to_author event |