Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
107866d0
Commit
107866d0
authored
Sep 26, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dispaly organization name at user page
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
0275f203
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
app/views/users/show.html.haml
app/views/users/show.html.haml
+5
-1
No files found.
app/views/users/show.html.haml
View file @
107866d0
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
.avatar-holder
.avatar-holder
=
link_to
avatar_icon
(
@user
,
400
),
target:
'_blank'
do
=
link_to
avatar_icon
(
@user
,
400
),
target:
'_blank'
do
=
image_tag
avatar_icon
(
@user
,
90
),
class:
"avatar s90"
,
alt:
''
=
image_tag
avatar_icon
(
@user
,
90
),
class:
"avatar s90"
,
alt:
''
.user-info
.user-info
.cover-title
.cover-title
=
@user
.
name
=
@user
.
name
...
@@ -70,6 +70,10 @@
...
@@ -70,6 +70,10 @@
.profile-link-holder.middle-dot-divider
.profile-link-holder.middle-dot-divider
=
icon
(
'map-marker'
)
=
icon
(
'map-marker'
)
=
@user
.
location
=
@user
.
location
-
unless
@user
.
organization
.
blank?
.profile-link-holder.middle-dot-divider
=
icon
(
'building'
)
=
@user
.
organization
-
if
@user
.
bio
.
present?
-
if
@user
.
bio
.
present?
.cover-desc
.cover-desc
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment