diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-25 07:39:58 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-25 07:39:58 +0000 |
| commit | 7737ef52a94aeee9d282a4201e35191054ff70d5 (patch) | |
| tree | 8ca55e5fe9925a928365c3a6ceaa4fed393277bc | |
| parent | 7ea9c5ce9a5b2b5d80ab423ec6c2318c1cc3d96f (diff) | |
| parent | a7a0e82d8717724676aca10670640008e2c22fa1 (diff) | |
| download | gitlab-ce-7737ef52a94aeee9d282a4201e35191054ff70d5.tar.gz | |
Merge branch '32807-company-icon' into 'master'
Use briefcase icon for company
Closes #32807
See merge request !11692
| -rw-r--r-- | app/views/users/show.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/32807-company-icon.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 2b70d70e360..c587155bc4f 100644 --- 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? diff --git a/changelogs/unreleased/32807-company-icon.yml b/changelogs/unreleased/32807-company-icon.yml new file mode 100644 index 00000000000..718108d3733 --- /dev/null +++ b/changelogs/unreleased/32807-company-icon.yml @@ -0,0 +1,4 @@ +--- +title: Use briefcase icon for company in profile page +merge_request: +author: |