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
439229ef
Commit
439229ef
authored
Jan 25, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2777 from zzet/add_project_button
Add assign project to team button on team page
parents
5ee8c132
890e774d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
app/views/projects/_new_form.html.haml
app/views/projects/_new_form.html.haml
+1
-1
app/views/teams/_projects.html.haml
app/views/teams/_projects.html.haml
+3
-3
app/views/teams/members/_show.html.haml
app/views/teams/members/_show.html.haml
+1
-1
No files found.
app/views/projects/_new_form.html.haml
View file @
439229ef
...
@@ -29,6 +29,6 @@
...
@@ -29,6 +29,6 @@
-
if
current_user
.
can_create_team?
-
if
current_user
.
can_create_team?
.clearfix
.clearfix
.input.light
.input.light
Want to share a
team between projects
?
Want to share a
project between team
?
=
link_to
new_team_path
,
class:
"btn very_small"
do
=
link_to
new_team_path
,
class:
"btn very_small"
do
Create a team
Create a team
app/views/teams/_projects.html.haml
View file @
439229ef
...
@@ -3,11 +3,11 @@
...
@@ -3,11 +3,11 @@
Projects
Projects
%small
%small
(
#{
projects
.
count
}
)
(
#{
projects
.
count
}
)
-
if
can?
current_user
,
:manage_
group
,
@group
-
if
can?
current_user
,
:manage_
user_team
,
@team
%span
.right
%span
.right
=
link_to
new_
project_path
(
namespace_id:
@group
.
id
),
class:
"btn very_small info"
do
=
link_to
new_
team_project_path
(
@team
),
class:
"btn very_small info"
do
%i
.icon-plus
%i
.icon-plus
New
Project
Assign
Project
%ul
.well-list
%ul
.well-list
-
if
projects
.
blank?
-
if
projects
.
blank?
%p
.nothing_here_message
This team has no projects yet
%p
.nothing_here_message
This team has no projects yet
...
...
app/views/teams/members/_show.html.haml
View file @
439229ef
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
.left.span2
.left.span2
%span
%span
Admin access
Admin access
=
check_box_tag
:group_admin
=
check_box_tag
:group_admin
,
true
,
@team
.
admin?
(
user
)
.right
.right
-
if
current_user
==
user
-
if
current_user
==
user
%span
.btn.disabled
This is you!
%span
.btn.disabled
This is you!
...
...
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