Re-use User objects for avatar_icon where possible
This removes the need for running an extra SQL query in these cases.
This commit is contained in:
parent
693e63f523
commit
9496356367
|
@ -8,7 +8,7 @@
|
|||
= @user.name
|
||||
%ul.well-list
|
||||
%li
|
||||
= image_tag avatar_icon(@user.email, 60), class: "avatar s60"
|
||||
= image_tag avatar_icon(@user, 60), class: "avatar s60"
|
||||
%li
|
||||
%span.light Profile page:
|
||||
%strong
|
||||
|
|
|
@ -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"
|
||||
= image_tag avatar_icon(issue.assignee, 16), class: "avatar s16"
|
||||
|
|
|
@ -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"
|
||||
= image_tag avatar_icon(merge_request.assignee, 16), class: "avatar s16"
|
||||
|
|
|
@ -79,7 +79,7 @@
|
|||
- @dashboard_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
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
%li{class: "#{dom_class(member)} js-toggle-container", id: dom_id(member)}
|
||||
%span{class: ("list-item-name" if show_controls)}
|
||||
- if member.user
|
||||
= image_tag avatar_icon(user.email, 16), class: "avatar s16", alt: ''
|
||||
= image_tag avatar_icon(user, 16), class: "avatar s16", alt: ''
|
||||
%strong
|
||||
= link_to user.name, user_path(user)
|
||||
%span.cgray= user.username
|
||||
|
|
|
@ -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: ''
|
||||
|
|
|
@ -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: ''
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
= render partial: 'layouts/collapse_button'
|
||||
- if current_user
|
||||
= link_to current_user, class: 'sidebar-user' do
|
||||
= image_tag avatar_icon(current_user.email, 60), alt: 'User activity', class: 'avatar avatar s36'
|
||||
= image_tag avatar_icon(current_user, 60), alt: 'User activity', class: 'avatar avatar s36'
|
||||
.username
|
||||
= current_user.username
|
||||
.content-wrapper
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
= render partial: 'layouts/collapse_button'
|
||||
- if current_user
|
||||
= link_to current_user, class: 'sidebar-user' do
|
||||
= image_tag avatar_icon(current_user.email, 60), alt: 'User activity', class: 'avatar avatar s36'
|
||||
= image_tag avatar_icon(current_user, 60), alt: 'User activity', class: 'avatar avatar s36'
|
||||
.username
|
||||
= current_user.username
|
||||
.content-wrapper
|
||||
|
|
|
@ -68,7 +68,7 @@
|
|||
|
||||
.col-md-5
|
||||
.light-well
|
||||
= image_tag avatar_icon(@user.email, 160), alt: '', class: 'avatar s160'
|
||||
= image_tag avatar_icon(@user, 160), alt: '', class: 'avatar s160'
|
||||
|
||||
.clearfix
|
||||
.profile-avatar-form-option
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
%li{ id: dom_id(issue, 'sortable'), class: 'issue-row', 'data-iid' => issue.iid, 'data-url' => issue_path(issue) }
|
||||
.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: ''
|
||||
%span
|
||||
= link_to [@project.namespace.becomes(Namespace), @project, issue] do
|
||||
%span.cgray ##{issue.iid}
|
||||
|
|
|
@ -5,4 +5,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: ''
|
||||
|
|
|
@ -104,7 +104,7 @@
|
|||
- @users.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
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
%li{class: "#{dom_class(member)} js-toggle-container project_member_row access-#{member.human_access.downcase}", id: dom_id(member)}
|
||||
%span.list-item-name
|
||||
- if member.user
|
||||
= image_tag avatar_icon(user.email, 16), class: "avatar s16", alt: ''
|
||||
= image_tag avatar_icon(user, 16), class: "avatar s16", alt: ''
|
||||
%strong
|
||||
= link_to user.name, user_path(user)
|
||||
%span.cgray= user.username
|
||||
|
|
|
@ -9,8 +9,8 @@
|
|||
.row
|
||||
%section.col-md-7
|
||||
.header-with-avatar
|
||||
= link_to avatar_icon(@user.email, 400), target: '_blank' do
|
||||
= image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: ''
|
||||
= link_to avatar_icon(@user, 400), target: '_blank' do
|
||||
= image_tag avatar_icon(@user, 90), class: "avatar avatar-tile s90", alt: ''
|
||||
%h3
|
||||
= @user.name
|
||||
- if @user == current_user
|
||||
|
|
Loading…
Reference in New Issue