diff options
| author | James Lopez <james@jameslopez.es> | 2016-05-03 11:34:13 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-05-03 11:34:13 +0200 |
| commit | 548c91e3c58d03d1e99c7945d14afe4abd605217 (patch) | |
| tree | 6297684ea014e215b4dcb27478f8c9d9f3620835 /app/views/events/_event.html.haml | |
| parent | 22ff009a54b281f8db2fd28530b84ebf53bf9de6 (diff) | |
| parent | 2a78e03ad54baf78b10fb3297cf0f38d78b87aa8 (diff) | |
| download | gitlab-ce-548c91e3c58d03d1e99c7945d14afe4abd605217.tar.gz | |
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
# Conflicts:
# lib/gitlab/import_export/command_line_util.rb
Diffstat (limited to 'app/views/events/_event.html.haml')
| -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? |