diff options
| author | Amit Rathi <amit@hypertrack.io> | 2018-11-12 12:06:59 +0530 |
|---|---|---|
| committer | Amit Rathi <amit@hypertrack.io> | 2018-11-12 12:06:59 +0530 |
| commit | c2407dab3e3ba1471ccebc008179f829d21fe3ce (patch) | |
| tree | b6f7165dbe4abb93dab5dde04fd4d6403a273eb0 /app/views/events/event/_push.html.haml | |
| parent | 8837519445c319a699e0f3ced1c6912c839f3389 (diff) | |
| parent | ec1d4243b2dbca7df6b793b412717f9b5b3db998 (diff) | |
| download | gitlab-ce-c2407dab3e3ba1471ccebc008179f829d21fe3ce.tar.gz | |
Merge branch 'master' into certmanager-temp
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 |