diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-07 21:44:43 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-07 21:44:43 +0000 |
| commit | 1bed998ee91231bafab74a5b423d9ef1d966989d (patch) | |
| tree | decbcbdcb6d43b903c362d1e3c9406b5eca2df7a /app/views/shared/issuable/_user_dropdown_item.html.haml | |
| parent | 475f41acd4a8e0666736d40feb4d8945cf2c306a (diff) | |
| parent | cb1b4af099ef88c530f4bfd24dd3290bf9387dfb (diff) | |
| download | gitlab-ce-1bed998ee91231bafab74a5b423d9ef1d966989d.tar.gz | |
Merge branch '35729-user-dropdown-in-filtered-search-does-not-load-avatar-on-master' into 'master'
Resolve "User dropdown in filtered search does not load avatar on `master`"
Closes #35729
See merge request !13181
Diffstat (limited to 'app/views/shared/issuable/_user_dropdown_item.html.haml')
| -rw-r--r-- | app/views/shared/issuable/_user_dropdown_item.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_user_dropdown_item.html.haml b/app/views/shared/issuable/_user_dropdown_item.html.haml index a82c01c6dc2..c18e4975bb8 100644 --- a/app/views/shared/issuable/_user_dropdown_item.html.haml +++ b/app/views/shared/issuable/_user_dropdown_item.html.haml @@ -3,7 +3,8 @@ %li.filter-dropdown-item{ class: ('js-current-user' if user == current_user) } %button.btn.btn-link.dropdown-user{ type: :button } - = user_avatar_without_link(user: user, lazy: avatar[:lazy], url: avatar[:url], size: 30) + .avatar-container.s40 + = user_avatar_without_link(user: user, lazy: avatar[:lazy], url: avatar[:url], size: 40).gsub('/images/{{avatar_url}}','{{avatar_url}}').html_safe .dropdown-user-details %span = user.name |