diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-25 21:34:37 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-25 21:34:37 +0000 |
| commit | 48f516a84376c5e9942ffad456f2f82dc9f6e7ad (patch) | |
| tree | b8bf7f808f584127bed5786c185fc3d1644df665 | |
| parent | 9182c93c00ff6c1dcf8c80349b0fd1ffe1fb99f7 (diff) | |
| parent | 0c0f634050ad79fcb9f9a340d56e2f5c5d407080 (diff) | |
| download | gitlab-ce-48f516a84376c5e9942ffad456f2f82dc9f6e7ad.tar.gz | |
Merge branch 'link_user_avatar_in_activity_page_to_profile' into 'master'
Link user avatar in activity page to user profile
Closes #14927
See merge request !3910
| -rw-r--r-- | app/views/events/_event.html.haml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml index 4d20dd5830e..5d622582088 100644 --- a/app/views/events/_event.html.haml +++ b/app/views/events/_event.html.haml @@ -4,7 +4,12 @@ #{time_ago_with_tooltip(event.created_at)} = cache [event, current_application_settings, "v2.2"] do - = image_tag avatar_icon(event.author_email, 40), class: "avatar s40", alt:'' + - if event.author + = link_to user_path(event.author.username) do + = image_tag avatar_icon(event.author_email, 40), class: "avatar s40", alt:'' + - else + = image_tag avatar_icon(event.author_email, 40), class: "avatar s40", alt:'' + - if event.created_project? = render "events/event/created_project", event: event - elsif event.push? |