Merge pull request #2746 from gitlabhq/features/teams
New feature: Teams
This commit is contained in:
commit
aa1f1eb680
115 changed files with 2714 additions and 174 deletions
|
@ -10,6 +10,8 @@
|
|||
= link_to "Stats", admin_root_path
|
||||
= nav_link(controller: :projects) do
|
||||
= link_to "Projects", admin_projects_path
|
||||
= nav_link(controller: :teams) do
|
||||
= link_to "Teams", admin_teams_path
|
||||
= nav_link(controller: :groups) do
|
||||
= link_to "Groups", admin_groups_path
|
||||
= nav_link(controller: :users) do
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
= render "layouts/head", title: "#{@group.name}"
|
||||
%body{class: "#{app_theme} application"}
|
||||
= render "layouts/flash"
|
||||
= render "layouts/head_panel", title: "#{@group.name}"
|
||||
= render "layouts/head_panel", title: "group: #{@group.name}"
|
||||
.container
|
||||
%ul.main_menu
|
||||
= nav_link(path: 'groups#show', html_options: {class: 'home'}) do
|
||||
|
|
40
app/views/layouts/user_team.html.haml
Normal file
40
app/views/layouts/user_team.html.haml
Normal file
|
@ -0,0 +1,40 @@
|
|||
!!! 5
|
||||
%html{ lang: "en"}
|
||||
= render "layouts/head", title: "#{@team.name}"
|
||||
%body{class: "#{app_theme} application"}
|
||||
= render "layouts/flash"
|
||||
= render "layouts/head_panel", title: "team: #{@team.name}"
|
||||
.container
|
||||
%ul.main_menu
|
||||
= nav_link(path: 'teams#show', html_options: {class: 'home'}) do
|
||||
= link_to "Home", team_path(@team), title: "Home"
|
||||
|
||||
= nav_link(path: 'teams#issues') do
|
||||
= link_to issues_team_path(@team) do
|
||||
Issues
|
||||
%span.count= Issue.opened.of_user_team(@team).count
|
||||
|
||||
= nav_link(path: 'teams#merge_requests') do
|
||||
= link_to merge_requests_team_path(@team) do
|
||||
Merge Requests
|
||||
%span.count= MergeRequest.opened.of_user_team(@team).count
|
||||
|
||||
= nav_link(path: 'teams#search') do
|
||||
= link_to "Search", search_team_path(@team)
|
||||
|
||||
= nav_link(controller: [:members]) do
|
||||
= link_to team_members_path(@team), class: "team-tab tab" do
|
||||
Members
|
||||
|
||||
- if can? current_user, :admin_user_team, @team
|
||||
= nav_link(controller: [:projects]) do
|
||||
= link_to team_projects_path(@team), class: "team-tab tab" do
|
||||
%i.icon-briefcase
|
||||
Projects
|
||||
|
||||
= nav_link(path: 'teams#edit') do
|
||||
= link_to edit_team_path(@team), class: "stat-tab tab " do
|
||||
%i.icon-edit
|
||||
Edit Team
|
||||
|
||||
.content= yield
|
Loading…
Add table
Add a link
Reference in a new issue