Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-16 21:52:39 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-16 21:52:39 +0400
commit5058c4fdcf51e3040121ecc822a6f856e7f4537d (patch)
tree08dbebd717ddbb86c04e19a220bac12100f9b337 /app/views/events
parent592412992daf1830fb1df5cc06aac02814c6f911 (diff)
Fix wall notes event trying to render target
Diffstat (limited to 'app/views/events')
-rw-r--r--app/views/events/event/_note.html.haml6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml
index 88b8532f8d8..8c12969345f 100644
--- a/app/views/events/event/_note.html.haml
+++ b/app/views/events/event/_note.html.haml
@@ -1,13 +1,15 @@
.event-title
%span.author_name= link_to_author event
- %span.event_label commented on #{event.target.noteable_type_name}
- - if event.target and event.note_target
+ %span.event_label commented on #{event.note_target_type}
+ - if event.note_target
- if event.note_commit?
= link_to event.note_short_commit_id, project_commit_path(event.project, event.note_commit_id), class: "commit_short_id"
- else
= link_to [event.project, event.note_target] do
%strong= truncate event.note_target_id
+ - elsif event.wall_note?
+ -# nothing here
- else
%strong (deleted)
at