Merge branch '32807-company-icon' into 'master'

Use briefcase icon for company Closes #32807 See merge request !11692

Merge branch '32807-company-icon' into 'master'
Use briefcase icon for company Closes #32807 See merge request !11692
7737ef52 · Phil Hughes · 7ea9c5ce · a7a0e82d · 7737ef52 · 7737ef52
Commit 7737ef52 authored May 25, 2017 by Phil Hughes
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

app/views/users/show.html.haml app/views/users/show.html.haml +1 -1

changelogs/unreleased/32807-company-icon.yml changelogs/unreleased/32807-company-icon.yml +4 -0

No files found.
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -71,7 +71,7 @@
              = @user.location
          - unless @user.organization.blank?
            .profile-link-holder.middle-dot-divider
-              = icon('building')
+              = icon('briefcase')
              = @user.organization

    - if @user.bio.present?

--- a/changelogs/unreleased/32807-company-icon.yml
+++ b/changelogs/unreleased/32807-company-icon.yml
+---
+title: Use briefcase icon for company in profile page
+merge_request:
+author: