diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-02 12:09:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-02 12:09:50 +0300 |
| commit | 43ae0b9e403cf774060267ee6d1a3dd502638068 (patch) | |
| tree | fe4f1601df28af77a4f657392f93adcd9af0019d /app/assets/javascripts/users_select | |
| parent | d5e4aa5266e94798f1c4a1a83a77fa0354056f0e (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 19846026726..fbede49e9e8 100644 --- a/app/assets/javascripts/users_select/index.js +++ b/app/assets/javascripts/users_select/index.js @@ -796,7 +796,7 @@ UsersSelect.prototype.renderRowAvatar = function(issuableType, user, img) { const mergeIcon = issuableType === 'merge_request' && !user.can_merge - ? `${spriteIcon('warning-solid', 's12 merge-icon')}` + ? spriteIcon('warning-solid', 's12 merge-icon') : ''; return `<span class="position-relative mr-2"> |