summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-09-26 19:33:35 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-09-27 14:04:39 +0300
commit107866d0e6500509d192f77e4f409f224fd38d98 (patch)
treec8903a06a72278dd513577c7727ac078bc3cf70c /app/views
parent0275f203ef857a54a523614cbd3136f9a7a311d6 (diff)
downloadgitlab-ce-107866d0e6500509d192f77e4f409f224fd38d98.tar.gz
Dispaly organization name at user page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views')
-rw-r--r--app/views/users/show.html.haml6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 2a57ac90bab..60fc0c0daf6 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -36,7 +36,7 @@
.avatar-holder
= link_to avatar_icon(@user, 400), target: '_blank' do
= image_tag avatar_icon(@user, 90), class: "avatar s90", alt: ''
-
+
.user-info
.cover-title
= @user.name
@@ -70,6 +70,10 @@
.profile-link-holder.middle-dot-divider
= icon('map-marker')
= @user.location
+ - unless @user.organization.blank?
+ .profile-link-holder.middle-dot-divider
+ = icon('building')
+ = @user.organization
- if @user.bio.present?
.cover-desc