diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
commit | 41fe97390ceddf945f3d967b8fdb3de4c66b7dea (patch) | |
tree | 9c8d89a8624828992f06d892cd2f43818ff5dcc8 /app/assets/javascripts/users_select | |
parent | 0804d2dc31052fb45a1efecedc8e06ce9bc32862 (diff) |
Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/users_select')
-rw-r--r-- | app/assets/javascripts/users_select/index.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/users_select/index.js b/app/assets/javascripts/users_select/index.js index 8ed92e6b948..656c851aa3d 100644 --- a/app/assets/javascripts/users_select/index.js +++ b/app/assets/javascripts/users_select/index.js @@ -210,7 +210,7 @@ function UsersSelect(currentUser, els, options = {}) { return axios.put(issueURL, data).then(({ data }) => { let user = {}; - let tooltipTitle = user.name; + let tooltipTitle; $dropdown.trigger('loaded.gl.dropdown'); $loading.addClass('gl-display-none'); if (data.assignee) { @@ -806,7 +806,9 @@ UsersSelect.prototype.renderRow = function ( </strong> ${ username - ? `<span class="dropdown-menu-user-username gl-text-gray-400">${username}</span>` + ? `<span class="dropdown-menu-user-username gl-text-gray-400">${escape( + username, + )}</span>` : '' } ${this.renderApprovalRules(elsClassName, user.applicable_approval_rules)} |