deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

move Team_members controller into project (conflicts with team/members controller)

Browse source
This commit is contained in:
Andrey Kumanyaev 2013-01-21 23:55:55 +04:00 • committed by Dmitriy Zaporozhets
parent 497f7ab5ba
commit 1dd0feacc7
11 changed files with 107 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/routes.rb
View file

@ -68,6 +68,9 @@ Gitlab::Application.routes.draw do
get :team
put :team_update
end
scope module: :projects do
resources :members, only: [:edit, :update, :destroy]
end
end
resources :teams do #, constraints: { id: /[^\/]+/ } do end
scope module: :teams do
@ -75,7 +78,6 @@ Gitlab::Application.routes.draw do
resources :projects, only: [:edit, :update, :destroy, :new, :create]
end
end
resources :team_members, only: [:edit, :update, :destroy]
resources :hooks, only: [:index, :create, :destroy] do
get :test
end