diff options
| author | Martin Wortschack <mwortschack@gitlab.com> | 2018-11-06 17:33:42 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-11-06 17:33:42 +0300 |
| commit | 31532b2d04e6647798cd3a6f72bcb40283341a9d (patch) | |
| tree | 9c07313f2ca6de8bfe8321867ec5432413d8efff /app/views/events/event/_push.html.haml | |
| parent | c8b6b9f243312262e5975185f4287f7fa666f717 (diff) | |
Resolve "Redesign activity feed"
Diffstat (limited to 'app/views/events/event/_push.html.haml')
| -rw-r--r-- | app/views/events/event/_push.html.haml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index 5f0ee79cd9b..82693ec832e 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -2,13 +2,15 @@ = icon_for_profile_event(event) -.event-title - %span.author_name= link_to_author(event) - %span.pushed #{event.action_name} #{event.ref_type} - %strong += event_user_info(event) + +.event-title.d-flex.flex-wrap + = inline_event_icon(event) + %span.event-type.d-inline-block.append-right-4.pushed #{event.action_name} #{event.ref_type} + %span - commits_link = project_commits_path(project, event.ref_name) - should_link = event.tag? ? project.repository.tag_exists?(event.ref_name) : project.repository.branch_exists?(event.ref_name) - = link_to_if should_link, event.ref_name, commits_link, class: 'ref-name' + = link_to_if should_link, event.ref_name, commits_link, class: 'ref-name append-right-4' = render "events/event_scope", event: event |