diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-06 19:07:19 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-06 19:07:19 +0000 |
| commit | f73292e471232683f314f58e9c58bacac5beb519 (patch) | |
| tree | b68d74cb34f1f73105c517b087b3a056c14cb78c | |
| parent | 37afdb076fde0ea377a2f72a6bf8884bf29b30ac (diff) | |
| parent | 6aa9ea7d02aeec500107ea06c774bae5a8efbd50 (diff) | |
| download | gitlab-ce-f73292e471232683f314f58e9c58bacac5beb519.tar.gz | |
Merge branch 'activity-links' into 'master'
Fixed issue with activity links not being consistent
## What does this MR do?
Previously, links for opening an issue/merge request & commenting where different. Opening would only have a link on the number whereas commenting would have link on the text as well. This standardises it to include the type as well (ie. issue)
## What are the relevant issue numbers?
Closes #17621
## Screenshots (if relevant)
See merge request !4400
| -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) |