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
9803e088
Commit
9803e088
authored
Feb 21, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Project sidebar improved
parent
1c22d4f5
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
7 deletions
+23
-7
projects_controller.rb
app/controllers/admin/projects_controller.rb
+1
-1
show.html.haml
app/views/projects/show.html.haml
+2
-2
_project_member.html.haml
app/views/widgets/_project_member.html.haml
+20
-4
No files found.
app/controllers/admin/projects_controller.rb
View file @
9803e088
...
...
@@ -52,7 +52,7 @@ class Admin::ProjectsController < ApplicationController
def
update
@admin_project
=
Project
.
find_by_code
(
params
[
:id
])
owner_id
=
params
[
:project
]
[
:owner_id
]
owner_id
=
params
[
:project
]
.
delete
(
:owner_id
)
if
owner_id
@admin_project
.
owner
=
User
.
find
(
owner_id
)
...
...
app/views/projects/show.html.haml
View file @
9803e088
...
...
@@ -14,8 +14,8 @@
=
text_field_tag
:project_clone
,
@project
.
url_to_repo
,
:class
=>
"xlarge one_click_select git_clone_url"
=
simple_format
@project
.
description
.ui-box
-
unless
@activities
.
blank?
.ui-box
%h5
.cgray
Recent Activity
.content_list
=
render
"feed"
...
...
app/views/widgets/_project_member.html.haml
View file @
9803e088
...
...
@@ -5,9 +5,9 @@
=
link_to
project_team_member_path
(
@project
,
member
),
:title
=>
current_user
.
name
do
=
image_tag
gravatar_icon
(
current_user
.
email
,
60
),
:class
=>
"thumbnail"
,
:width
=>
60
%h4
H
i
,
=
truncate
current_user
.
first_name
,
:lenght
=>
24
!
H
ey
,
#{
truncate
current_user
.
first_name
,
:lenght
=>
24
}
!
%p
-
if
@project
.
issues_enabled
Assigned issues:
...
...
@@ -19,9 +19,25 @@
%br
Your merge requests:
=
current_user
.
assigned_merge_requests
.
opened
.
count
%br
%br
-
if
@project
.
merge_requests_enabled
=
link_to
new_project_merge_request_path
(
@project
),
:title
=>
"New Merge Request"
,
:class
=>
"btn small"
do
Merge Request
-
if
@project
.
issues_enabled
=
link_to
new_project_issue_path
(
@project
),
:title
=>
"New Issue"
,
:class
=>
"btn small"
do
Issue
%hr
%p
Your access level in this project is
%code
#{
member
.
project_access_human
}
%br
Visit member card for more information
.link_holder
=
link_to
project_team_member_path
(
@project
,
member
),
:title
=>
current_user
.
name
do
=
"
Access:
#{
member
.
project_access_human
}
»"
=
"
Member Card
»"
...
...
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