Merge branch '225936-replace-fa-user-s-icons-with-gitlab-svg-user-s-icon' into 'master'

Replace fa-user(s) icons with GitLab SVG user(s) icon

Closes #225936

See merge request gitlab-org/gitlab!39165

app/assets/javascripts/users_select/index.js

@@ -11,7 +11,7 @@ import {
 import axios from '../lib/utils/axios_utils';
 import { s__, __, sprintf } from '../locale';
 import ModalStore from '../boards/stores/modal_store';
-import { parseBoolean } from '../lib/utils/common_utils';
+import { parseBoolean, spriteIcon } from '../lib/utils/common_utils';
 import { getAjaxUsersSelectOptions, getAjaxUsersSelectParams } from './utils';
 import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
 
@@ -225,7 +225,9 @@ function UsersSelect(currentUser, els, options = {}) {
       });
     };
     collapsedAssigneeTemplate = template(
-      '<% if( avatar ) { %> <a class="author-link" href="/<%- username %>"> <img width="24" class="avatar avatar-inline s24" alt="" src="<%- avatar %>"> </a> <% } else { %> <i class="fa fa-user"></i> <% } %>',
+      `<% if( avatar ) { %> <a class="author-link" href="/<%- username %>"> <img width="24" class="avatar avatar-inline s24" alt="" src="<%- avatar %>"> </a> <% } else { %> ${spriteIcon(
+        'user',
+      )} <% } %>`,
     );
     assigneeTemplate = template(
       `<% if (username) { %> <a class="author-link bold" href="/<%- username %>"> <% if( avatar ) { %> <img width="32" class="avatar avatar-inline s32" alt="" src="<%- avatar %>"> <% } %> <span class="author"><%- name %></span> <span class="username"> @<%- username %> </span> </a> <% } else { %> <span class="no-value assign-yourself">

app/assets/stylesheets/fontawesome_custom.scss

@@ -182,10 +182,6 @@
   content: '\f1a0';
 }
 
-.fa-user::before {
-  content: '\f007';
-}
-
 .fa-exclamation-circle::before {
   content: '\f06a';
 }
@@ -206,10 +202,6 @@
   content: '\f016';
 }
 
-.fa-users::before {
-  content: '\f0c0';
-}
-
 .fa-tags::before {
   content: '\f02c';
 }
@@ -262,10 +254,6 @@
   content: '\f061';
 }
 
-.fa-user-secret::before {
-  content: '\f21b';
-}
-
 .fa-search-plus::before {
   content: '\f00e';
 }

changelogs/unreleased/225936-replace-fa-user-s-icons-with-gitlab-svg-user-s-icon.yml

+---
+title: Replace fa-user(s) icons with GitLab SVG user(s) icon
+merge_request: 39165
+author:
+type: changed