diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 15:09:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 15:09:26 +0300 |
| commit | fa6c2426a5beed14dd7cfd0b4c493ff7ec886837 (patch) | |
| tree | 58238851ff949fafbc162e03610602df8c0924a2 /app/assets/javascripts/users_select | |
| parent | 38de2aa494589f6e250a1b11862cbab83c2ae4d1 (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 23bde17eeae..19846026726 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 - ? '<i class="fa fa-exclamation-triangle merge-icon"></i>' + ? `${spriteIcon('warning-solid', 's12 merge-icon')}` : ''; return `<span class="position-relative mr-2"> |