Merge branch 'nogravatar-fix-default-avatar' into 'master'

Fix avatar icon missing when Gravatar is disabled

Closes #34733 and #38715

See merge request gitlab-org/gitlab-ce!16681

app/assets/javascripts/sidebar/components/assignees/assignees.js

@@ -84,7 +84,7 @@ export default {
       return !this.showLess || (index < this.defaultRenderCount && this.showLess);
     },
     avatarUrl(user) {
-      return user.avatar || user.avatar_url;
+      return user.avatar || user.avatar_url || gon.default_avatar_url;
     },
     assigneeUrl(user) {
       return `${this.rootPath}${user.username}`;

app/assets/javascripts/users_select.js

@@ -492,7 +492,7 @@ function UsersSelect(currentUser, els, options = {}) {
         renderRow: function(user) {
           var avatar, img, listClosingTags, listWithName, listWithUserName, username;
           username = user.username ? "@" + user.username : "";
-          avatar = user.avatar_url ? user.avatar_url : false;
+          avatar = user.avatar_url ? user.avatar_url : gon.default_avatar_url;
 
           let selected = false;
 
@@ -513,10 +513,8 @@ function UsersSelect(currentUser, els, options = {}) {
           if (user.beforeDivider != null) {
             `<li><a href='#' class='${selected === true ? 'is-active' : ''}'>${_.escape(user.name)}</a></li>`;
           } else {
-            if (avatar) {
             img = "<img src='" + avatar + "' class='avatar avatar-inline' width='32' />";
           }
-          }
 
           return `
             <li data-user-id=${user.id}>

app/helpers/application_helper.rb

@@ -89,7 +89,7 @@ module ApplicationHelper
   end
 
   def default_avatar
-    'no_avatar.png'
+    asset_path('no_avatar.png')
   end
 
   def last_commit(project)

changelogs/unreleased/34733-fix-default-avatar-when-gravatar-disabled.yml

+---
+title: Fix default avatar icon missing when Gravatar is disabled
+merge_request: 16681
+author: Felix Geyer
+type: fixed

spec/helpers/application_helper_spec.rb

@@ -100,7 +100,7 @@ describe ApplicationHelper do
       end
 
       it 'returns a generic avatar' do
-        expect(helper.gravatar_icon(user_email)).to match('no_avatar.png')
+        expect(helper.gravatar_icon(user_email)).to match_asset_path('no_avatar.png')
       end
     end
 
@@ -110,7 +110,7 @@ describe ApplicationHelper do
       end
 
       it 'returns a generic avatar when email is blank' do
-        expect(helper.gravatar_icon('')).to match('no_avatar.png')
+        expect(helper.gravatar_icon('')).to match_asset_path('no_avatar.png')
       end
 
       it 'returns a valid Gravatar URL' do