diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 22:27:06 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 22:27:06 +0200 |
| commit | 95a10f4533fdb708c61ffda95099bddd94800f02 (patch) | |
| tree | bf5c561472c47d34e5ff1f643c49cd2a6b206f15 /app/views/events/event/_common.html.haml | |
| parent | 17c6bec79d876ce932edc0edc5d17622adb2f724 (diff) | |
| parent | b4e84809e8170a43126507da0bc6a3b94c33804b (diff) | |
| download | gitlab-ce-95a10f4533fdb708c61ffda95099bddd94800f02.tar.gz | |
Merge remote-tracking branch 'origin/master' into ci-lfs-fetch
Diffstat (limited to 'app/views/events/event/_common.html.haml')
| -rw-r--r-- | app/views/events/event/_common.html.haml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml index c7f29f2fc0e..2e2403347c1 100644 --- a/app/views/events/event/_common.html.haml +++ b/app/views/events/event/_common.html.haml @@ -1,10 +1,14 @@ .event-title %span.author_name= link_to_author event %span.event_label{class: event.action_name} - = event_action_name(event) - - if event.target - %strong= link_to event.target.reference_link_text, [event.project.namespace.becomes(Namespace), event.project, event.target], class: 'has-tooltip', title: event.target_title + = event.action_name + %strong + = link_to [event.project.namespace.becomes(Namespace), event.project, event.target], class: 'has-tooltip', title: event.target_title do + = event.target_type.titleize.downcase + = event.target.reference_link_text + - else + = event_action_name(event) = event_preposition(event) |