summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-06-29 15:26:20 +0000
committerFatih Acet <acetfatih@gmail.com>2016-06-29 15:26:20 +0000
commit79fd3c7b9e152c46b1c600bc645f4da65006242e (patch)
tree3ec9ced1112d4484798d810e2e7c2c8bbf7f624c
parentbef4294c58e0bbadc01f633fc8bea514801de7ae (diff)
parentd959abf01c420540b7bb19775541b4fe77aed0ca (diff)
downloadgitlab-ce-79fd3c7b9e152c46b1c600bc645f4da65006242e.tar.gz
Merge branch 'cal-activities-target-reference' into 'master'
Changes calendar activities to use target reference ## What does this MR do? Uses the targets reference in the calendar activities list. Previously it was using `#` which is wrong for merge requests. ## Screenshots (if relevant) ![Screen_Shot_2016-06-29_at_14.29.08](/uploads/4c52bbc7ca68d7b25e5bfb11ea55eef7/Screen_Shot_2016-06-29_at_14.29.08.png) See merge request !4992
-rw-r--r--app/views/users/calendar_activities.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml
index 630d97e339d..f51599212db 100644
--- a/app/views/users/calendar_activities.html.haml
+++ b/app/views/users/calendar_activities.html.haml
@@ -14,7 +14,7 @@
- else
= event_action_name(event)
- if event.target
- %strong= link_to "##{event.target_iid}", [event.project.namespace.becomes(Namespace), event.project, event.target]
+ %strong= link_to "#{event.target.to_reference}", [event.project.namespace.becomes(Namespace), event.project, event.target]
at
%strong