diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 00:06:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 00:06:14 +0300 |
| commit | c324100967bbdd3f2f0ca3406c9261d35e69f148 (patch) | |
| tree | ecfd5d521d90792cbc922309e6930b1ba2badff6 /app/assets/javascripts/user_popovers.js | |
| parent | d8ccc7a00b7a1ea954263170a2044257424a2cfe (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/user_popovers.js')
| -rw-r--r-- | app/assets/javascripts/user_popovers.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/user_popovers.js b/app/assets/javascripts/user_popovers.js index c0b7587be10..7d6a725b30f 100644 --- a/app/assets/javascripts/user_popovers.js +++ b/app/assets/javascripts/user_popovers.js @@ -73,9 +73,14 @@ const handleUserPopoverMouseOver = event => { location: userData.location, bio: userData.bio, organization: userData.organization, + status: userData.status, loaded: true, }); + if (userData.status) { + return Promise.resolve(); + } + return UsersCache.retrieveStatusById(userId); }) .then(status => { |