Commit 2993e280 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'note-avatar-link' into 'master'

Link note avatar to user.

See merge request !446
parents 69ab616b 1651c0bc
...@@ -35,6 +35,7 @@ v 7.10.0 (unreleased) ...@@ -35,6 +35,7 @@ v 7.10.0 (unreleased)
- Don't show commit comment button when user is not signed in. - Don't show commit comment button when user is not signed in.
- Don't include system notes in issue/MR comment count. - Don't include system notes in issue/MR comment count.
- Don't mark merge request as updated when merge status relative to target branch changes. - Don't mark merge request as updated when merge status relative to target branch changes.
- Link note avatar to user.
v 7.9.0 v 7.9.0
- Send EmailsOnPush email when branch or tag is created or deleted. - Send EmailsOnPush email when branch or tag is created or deleted.
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
.timeline-entry .timeline-entry
.timeline-entry-inner .timeline-entry-inner
.timeline-icon .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 .timeline-content
- if note.for_merge_request? - if note.for_merge_request?
- if note.outdated? - if note.outdated?
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
- if note.system - if note.system
%span.fa.fa-circle %span.fa.fa-circle
- else - 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 .timeline-content
.note-header .note-header
.note-actions .note-actions
...@@ -21,7 +22,8 @@ ...@@ -21,7 +22,8 @@
%i.fa.fa-trash-o.cred %i.fa.fa-trash-o.cred
Remove Remove
- if note.system - 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) = link_to_member(@project, note.author, avatar: false)
%span.author-username %span.author-username
= '@' + note.author.username = '@' + note.author.username
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment