Commit 439229ef authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #2777 from zzet/add_project_button

Add assign project to team button on team page
parents 5ee8c132 890e774d
...@@ -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
...@@ -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
......
...@@ -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!
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment