Merge branch '121931-replace-font-awesome-cog-icon-with-gitlab-settings-icon' into 'master'

Resolve "Replace Font Awesome cog icon with GitLab settings icon"

Closes #121931

See merge request gitlab-org/gitlab!22259

app/views/admin/users/_user.html.haml

@@ -19,8 +19,8 @@
       = link_to _('Edit'), edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: 'btn btn-default'
       - unless user == current_user
         %button.dropdown-new.btn.btn-default{ type: 'button', data: { toggle: 'dropdown' } }
-          = icon('cog')
-          = icon('caret-down')
+          = sprite_icon('settings')
+          = sprite_icon('chevron-down')
         %ul.dropdown-menu.dropdown-menu-right
           %li.dropdown-header
             = _('Settings')

changelogs/unreleased/121931-replace-font-awesome-cog-icon-with-gitlab-settings-icon.yml

+---
+title: Replace Font Awesome cog icon with GitLab settings icon
+merge_request: 22259
+author:
+type: other