summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-06-01 12:11:16 +0100
committerPhil Hughes <me@iamphill.com>2016-06-02 09:11:44 +0100
commit6aa9ea7d02aeec500107ea06c774bae5a8efbd50 (patch)
tree8112b2127dd359446687619daecfc35fbba3d031
parent30524901e28176e96e7c0d1a710508367ff99d9f (diff)
downloadgitlab-ce-activity-links.tar.gz
Fixed issue with activity links not being consistentactivity-links
Closes #17621
-rw-r--r--app/views/events/event/_common.html.haml10
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)