diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2015-10-12 17:03:12 +0200 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2015-10-15 12:05:01 +0200 |
| commit | 949635636728fa388d983b180b7ab4e55aa8caa9 (patch) | |
| tree | 4186d3d9e3c8fdcb4f44a5d6ca2fec685e2f5adf /app/views/groups/milestones | |
| parent | 693e63f5234032aa1abbc226c0d6337d6ea810ed (diff) | |
| download | gitlab-ce-949635636728fa388d983b180b7ab4e55aa8caa9.tar.gz | |
Re-use User objects for avatar_icon where possible
This removes the need for running an extra SQL query in these cases.
Diffstat (limited to 'app/views/groups/milestones')
| -rw-r--r-- | app/views/groups/milestones/_issue.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/milestones/_merge_request.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/milestones/show.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/groups/milestones/_issue.html.haml b/app/views/groups/milestones/_issue.html.haml index 09f9b4b8969..9b85d83d6d8 100644 --- a/app/views/groups/milestones/_issue.html.haml +++ b/app/views/groups/milestones/_issue.html.haml @@ -7,4 +7,4 @@ = link_to_gfm issue.title, [project.namespace.becomes(Namespace), project, issue], title: issue.title .pull-right.assignee-icon - if issue.assignee - = image_tag avatar_icon(issue.assignee.email, 16), class: "avatar s16", alt: '' + = image_tag avatar_icon(issue.assignee, 16), class: "avatar s16", alt: '' diff --git a/app/views/groups/milestones/_merge_request.html.haml b/app/views/groups/milestones/_merge_request.html.haml index d0d1426762b..e3aa4aad198 100644 --- a/app/views/groups/milestones/_merge_request.html.haml +++ b/app/views/groups/milestones/_merge_request.html.haml @@ -7,4 +7,4 @@ = link_to_gfm merge_request.title, [project.namespace.becomes(Namespace), project, merge_request], title: merge_request.title .pull-right.assignee-icon - if merge_request.assignee - = image_tag avatar_icon(merge_request.assignee.email, 16), class: "avatar s16", alt: '' + = image_tag avatar_icon(merge_request.assignee, 16), class: "avatar s16", alt: '' diff --git a/app/views/groups/milestones/show.html.haml b/app/views/groups/milestones/show.html.haml index 0c213f42186..c6cde97c585 100644 --- a/app/views/groups/milestones/show.html.haml +++ b/app/views/groups/milestones/show.html.haml @@ -87,7 +87,7 @@ - @group_milestone.participants.each do |user| %li = link_to user, title: user.name, class: "darken" do - = image_tag avatar_icon(user.email, 32), class: "avatar s32" + = image_tag avatar_icon(user, 32), class: "avatar s32" %strong= truncate(user.name, lenght: 40) %br %small.cgray= user.username |