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
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-03-24 20:16:40 +0300
committerDouwe Maan <douwe@gitlab.com>2015-03-24 20:16:40 +0300
commit1651c0bc448b4e80462f73f36a778e736df88b2b (patch)
tree304414d70eb201c88d3eb663ccb552729078636f /app
parent2953e0d19b46a937ee9d84139adbc263c8e89757 (diff)
Link note avatar to user.
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/notes/_discussion.html.haml3
-rw-r--r--app/views/projects/notes/_note.html.haml6
2 files changed, 6 insertions, 3 deletions
diff --git a/app/views/projects/notes/_discussion.html.haml b/app/views/projects/notes/_discussion.html.haml
index f4c6fad2fed..3561ca49f81 100644
--- a/app/views/projects/notes/_discussion.html.haml
+++ b/app/views/projects/notes/_discussion.html.haml
@@ -2,7 +2,8 @@
.timeline-entry
.timeline-entry-inner
.timeline-icon
- = image_tag avatar_icon(note.author_email), class: "avatar s40"
+ = link_to user_path(note.author) do
+ = image_tag avatar_icon(note.author_email), class: "avatar s40"
.timeline-content
- if note.for_merge_request?
- if note.outdated?
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index f3d00a6f06d..71bdf5c8f2a 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -4,7 +4,8 @@
- if note.system
%span.fa.fa-circle
- else
- = image_tag avatar_icon(note.author_email), class: "avatar s40"
+ = link_to user_path(note.author) do
+ = image_tag avatar_icon(note.author_email), class: "avatar s40"
.timeline-content
.note-header
.note-actions
@@ -21,7 +22,8 @@
%i.fa.fa-trash-o.cred
Remove
- if note.system
- = image_tag avatar_icon(note.author_email), class: "avatar s16"
+ = link_to user_path(note.author) do
+ = image_tag avatar_icon(note.author_email), class: "avatar s16"
= link_to_member(@project, note.author, avatar: false)
%span.author-username
= '@' + note.author.username