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:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-26 15:08:22 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-26 15:08:22 +0300
commit1691cbe307f7698b3ee39811278990c43b6751a5 (patch)
tree2bd7d5b7143242f540a9edde92c83c791ebf8af4 /app/views/events
parent27c6c4bf061c3a2289ce4808b1b354535994d09d (diff)
Add latest changes from gitlab-org/gitlab@master
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 7e2103287f7..21e8b1401ca 100644
--- a/app/views/events/event/_note.html.haml
+++ b/app/views/events/event/_note.html.haml
@@ -7,8 +7,10 @@
%span.event-type.d-inline-block.append-right-4{ class: event.action_name }
= event.action_name
= event_note_title_html(event)
- %span.event-target-title.append-right-4{ dir: "auto" }
- = "&quot;".html_safe + event.target.title + "&quot".html_safe
+ - title = note_target_title(event.target)
+ - if title.present?
+ %span.event-target-title.append-right-4{ dir: "auto" }
+ = "&quot;".html_safe + title + "&quot".html_safe
= render "events/event_scope", event: event