Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/framework/common.scss

@@ -385,6 +385,7 @@ img.emoji {
 .flex { display: flex; }
 .center { text-align: center; }
 .vertical-align-middle { vertical-align: middle; }
+.vertical-align-sub { vertical-align: sub; }
 .flex-align-self-center { align-self: center; }
 .flex-grow { flex-grow: 1; }
 .flex-no-shrink { flex-shrink: 0; }

app/views/users/show.html.haml

@@ -74,11 +74,11 @@
               = link_to @user.short_website_url, @user.full_website_url, class: 'text-link', target: '_blank', rel: 'me noopener noreferrer nofollow'
           - unless @user.location.blank?
             .profile-link-holder.middle-dot-divider
-              = icon('map-marker')
+              = sprite_icon('location', size: 16, css_class: 'vertical-align-sub')
               = @user.location
           - unless @user.organization.blank?
             .profile-link-holder.middle-dot-divider
-              = icon('briefcase')
+              = sprite_icon('work', size: 16, css_class: 'vertical-align-sub')
               = @user.organization
 
         - if @user.bio.present?

changelogs/unreleased/update-spriteicon-from-icon-on-profile.yml

+---
+title: Update to GitLab SVG icon from Font Awesome in profile for location and work
+merge_request: 24671
+author: Yoginth
+type: changed