diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-03-24 18:16:40 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-03-24 18:16:40 +0100 |
| commit | 1651c0bc448b4e80462f73f36a778e736df88b2b (patch) | |
| tree | 304414d70eb201c88d3eb663ccb552729078636f | |
| parent | 2953e0d19b46a937ee9d84139adbc263c8e89757 (diff) | |
| download | gitlab-ce-note-avatar-link.tar.gz | |
Link note avatar to user.note-avatar-link
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/notes/_discussion.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 25936eb1e1d..b61eae50698 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -31,6 +31,7 @@ v 7.10.0 (unreleased) - Replace commits calendar with faster contribution calendar that includes issues and merge requests - Add inifinite scroll to user page activity - Don't show commit comment button when user is not signed in. + - Link note avatar to user. v 7.9.0 - Send EmailsOnPush email when branch or tag is created or deleted. 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 |