diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-27 18:06:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-27 18:06:16 +0300 |
commit | 8320f7956d72986f5a7c850874fce4f8b5a8e015 (patch) | |
tree | c761b309cfff422609d47a17ac4d6a732c142f49 /app/assets | |
parent | 45482d5a2704da7fabe4ccf07f85d9be6e0a791a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/user_popovers.js | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/app/assets/javascripts/user_popovers.js b/app/assets/javascripts/user_popovers.js index 948f4d5e631..c0b7587be10 100644 --- a/app/assets/javascripts/user_popovers.js +++ b/app/assets/javascripts/user_popovers.js @@ -63,7 +63,7 @@ const handleUserPopoverMouseOver = event => { UsersCache.retrieveById(userId) .then(userData => { if (!userData) { - return; + return undefined; } Object.assign(user, { @@ -76,19 +76,16 @@ const handleUserPopoverMouseOver = event => { loaded: true, }); - UsersCache.retrieveStatusById(userId) - .then(status => { - if (!status) { - return; - } + return UsersCache.retrieveStatusById(userId); + }) + .then(status => { + if (!status) { + return; + } - Object.assign(user, { - status, - }); - }) - .catch(() => { - throw new Error(`User status for "${userId}" could not be retrieved!`); - }); + Object.assign(user, { + status, + }); }) .catch(() => { renderedPopover.$destroy(); |