diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-23 09:08:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-23 09:08:52 +0300 |
| commit | 817adcd0d02e4ecbfa5e317703f7909384d1b8af (patch) | |
| tree | 7705622529c5cf54cd75072f7d602b1ca4f077f2 /app/assets/javascripts/users_select | |
| parent | 2c505d2a49e04506e30266c05e84d68971f87502 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/users_select')
| -rw-r--r-- | app/assets/javascripts/users_select/index.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/users_select/index.js b/app/assets/javascripts/users_select/index.js index 79ef10c456f..f72de8c2f4d 100644 --- a/app/assets/javascripts/users_select/index.js +++ b/app/assets/javascripts/users_select/index.js @@ -263,7 +263,7 @@ function UsersSelect(currentUser, els, options = {}) { const userId = parseInt(input.value, 10); const { avatarUrl, avatar_url, name, username, canMerge } = input.dataset; return { - avatar_url: avatarUrl || avatar_url, + avatar_url: avatarUrl || avatar_url || gon.default_avatar_url, id: userId, name, username, |