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
0
Merge Requests
0
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
Jérome Perrin
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
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
9 deletions
+25
-9
app/controllers/admin/projects_controller.rb
app/controllers/admin/projects_controller.rb
+1
-1
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+4
-4
app/views/widgets/_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
...
@@ -52,7 +52,7 @@ class Admin::ProjectsController < ApplicationController
def
update
def
update
@admin_project
=
Project
.
find_by_code
(
params
[
:id
])
@admin_project
=
Project
.
find_by_code
(
params
[
:id
])
owner_id
=
params
[
:project
]
[
:owner_id
]
owner_id
=
params
[
:project
]
.
delete
(
:owner_id
)
if
owner_id
if
owner_id
@admin_project
.
owner
=
User
.
find
(
owner_id
)
@admin_project
.
owner
=
User
.
find
(
owner_id
)
...
...
app/views/projects/show.html.haml
View file @
9803e088
...
@@ -14,8 +14,8 @@
...
@@ -14,8 +14,8 @@
=
text_field_tag
:project_clone
,
@project
.
url_to_repo
,
:class
=>
"xlarge one_click_select git_clone_url"
=
text_field_tag
:project_clone
,
@project
.
url_to_repo
,
:class
=>
"xlarge one_click_select git_clone_url"
=
simple_format
@project
.
description
=
simple_format
@project
.
description
-
unless
@activities
.
blank?
.ui-box
.ui-box
%h5
.cgray
Recent Activity
%h5
.cgray
Recent Activity
.content_list
=
render
"feed"
.content_list
=
render
"feed"
...
...
app/views/widgets/_project_member.html.haml
View file @
9803e088
...
@@ -5,9 +5,9 @@
...
@@ -5,9 +5,9 @@
=
link_to
project_team_member_path
(
@project
,
member
),
:title
=>
current_user
.
name
do
=
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
=
image_tag
gravatar_icon
(
current_user
.
email
,
60
),
:class
=>
"thumbnail"
,
:width
=>
60
%h4
%h4
H
i
,
H
ey
,
=
truncate
current_user
.
first_name
,
:lenght
=>
24
#{
truncate
current_user
.
first_name
,
:lenght
=>
24
}
!
!
%p
%p
-
if
@project
.
issues_enabled
-
if
@project
.
issues_enabled
Assigned issues:
Assigned issues:
...
@@ -19,9 +19,25 @@
...
@@ -19,9 +19,25 @@
%br
%br
Your merge requests:
Your merge requests:
=
current_user
.
assigned_merge_requests
.
opened
.
count
=
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_holder
=
link_to
project_team_member_path
(
@project
,
member
),
:title
=>
current_user
.
name
do
=
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