diff options
author | Fatih Acet <acetfatih@gmail.com> | 2018-01-29 16:25:40 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2018-01-29 16:25:40 +0300 |
commit | 85e6ffb597c55d7ca5f059325a5af2d7562acae8 (patch) | |
tree | 8e94117c7e01fe5680773fc04992bfa4a958a055 /app | |
parent | 57892e6decd6fdbf1b040feb836f0a5f0f190dee (diff) | |
parent | ed341db24fac8ce62513c3953da8097ba8920271 (diff) |
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
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/sidebar/components/assignees/assignees.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/users_select.js | 6 | ||||
-rw-r--r-- | app/helpers/application_helper.rb | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/app/assets/javascripts/sidebar/components/assignees/assignees.js b/app/assets/javascripts/sidebar/components/assignees/assignees.js index 7e5feac622c..643877b9d47 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignees.js +++ b/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}`; diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index f249bd036d6..ab108906732 100644 --- a/app/assets/javascripts/users_select.js +++ b/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,9 +513,7 @@ 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' />"; - } + img = "<img src='" + avatar + "' class='avatar avatar-inline' width='32' />"; } return ` diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d13407a06c8..6530327698b 100644 --- a/app/helpers/application_helper.rb +++ b/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) |