BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
fc43c4e7
Unverified
Commit
fc43c4e7
authored
Jun 03, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restyle admin/user page
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
87e0fe6f
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
6 deletions
+9
-6
users_controller.rb
app/controllers/admin/users_controller.rb
+2
-1
show.html.haml
app/views/admin/users/show.html.haml
+0
-0
_projects.html.haml
app/views/users/_projects.html.haml
+1
-1
show.html.haml
app/views/users/show.html.haml
+6
-4
No files found.
app/controllers/admin/users_controller.rb
View file @
fc43c4e7
...
@@ -8,7 +8,8 @@ class Admin::UsersController < Admin::ApplicationController
...
@@ -8,7 +8,8 @@ class Admin::UsersController < Admin::ApplicationController
end
end
def
show
def
show
@projects
=
user
.
authorized_projects
@personal_projects
=
user
.
personal_projects
@joined_projects
=
user
.
projects
.
joined
(
@user
)
end
end
def
new
def
new
...
...
app/views/admin/users/show.html.haml
View file @
fc43c4e7
This diff is collapsed.
Click to expand it.
app/views/users/_projects.html.haml
View file @
fc43c4e7
.panel.panel-default
.panel.panel-default
.panel-heading
Personal projects
.panel-heading
Personal projects
%ul
.well-list
%ul
.well-list
-
@
projects
.
each
do
|
project
|
-
projects
.
each
do
|
project
|
%li
%li
=
link_to_project
project
=
link_to_project
project
app/views/users/show.html.haml
View file @
fc43c4e7
...
@@ -13,12 +13,14 @@
...
@@ -13,12 +13,14 @@
%br
%br
%small
member since
#{
@user
.
created_at
.
stamp
(
"Nov 12, 2031"
)
}
%small
member since
#{
@user
.
created_at
.
stamp
(
"Nov 12, 2031"
)
}
.clearfix
.clearfix
%h4
Groups:
=
render
'groups'
,
groups:
@groups
-
if
@groups
.
any?
%hr
%h4
Groups:
=
render
'groups'
,
groups:
@groups
%hr
%h4
User Activity:
%h4
User Activity:
=
render
@events
=
render
@events
.col-md-4
.col-md-4
=
render
'profile'
,
user:
@user
=
render
'profile'
,
user:
@user
-
if
@projects
.
present?
-
if
@projects
.
present?
=
render
'projects'
=
render
'projects'
,
projects:
@projects
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