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

update routes

Browse source
This commit is contained in:
Andrey Kumanyaev 2013-01-23 01:03:52 +04:00 committed by Dmitriy Zaporozhets
parent 7534154b44
commit 7658f8c151
1 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
config/routes.rb
View file

@ -56,6 +56,7 @@ Gitlab::Application.routes.draw do
put :unblock put :unblock
end end
end end
resources :groups, constraints: { id: /[^\/]+/ } do resources :groups, constraints: { id: /[^\/]+/ } do
member do member do
put :project_update put :project_update
@ -63,26 +64,31 @@ Gitlab::Application.routes.draw do
delete :remove_project delete :remove_project
end end
end end
resources :teams, constraints: { id: /[^\/]+/ } do
scope module: :teams do
resources :members, only: [:edit, :update, :destroy, :new, :create]
resources :projects, only: [:edit, :update, :destroy, :new, :create], constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }
end
end
resources :hooks, only: [:index, :create, :destroy] do
get :test
end
resource :logs, only: [:show]
resource :resque, controller: 'resque', only: [:show]
resources :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }, except: [:new, :create] do resources :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }, except: [:new, :create] do
member do member do
get :team get :team
put :team_update put :team_update
end end
scope module: :projects do scope module: :projects, constraints: { id: /[^\/]+/ } do
resources :members, only: [:edit, :update, :destroy] resources :members, only: [:edit, :update, :destroy]
end end
end end
resources :teams do #, constraints: { id: /[^\/]+/ } do end
scope module: :teams do
resources :members, only: [:edit, :update, :destroy, :new, :create]
resources :projects, only: [:edit, :update, :destroy, :new, :create]
end
end
resources :hooks, only: [:index, :create, :destroy] do
get :test
end
resource :logs, only: [:show]
resource :resque, controller: 'resque', only: [:show]
root to: "dashboard#index" root to: "dashboard#index"
end end
@ -116,7 +122,6 @@ Gitlab::Application.routes.draw do
get "dashboard/issues" => "dashboard#issues" get "dashboard/issues" => "dashboard#issues"
get "dashboard/merge_requests" => "dashboard#merge_requests" get "dashboard/merge_requests" => "dashboard#merge_requests"
# #
# Groups Area # Groups Area
# #
@ -130,19 +135,18 @@ Gitlab::Application.routes.draw do
end end
end end
resources :teams do #
# Teams Area
#
resources :teams, constraints: { id: /[^\/]+/ } do
member do member do
get :issues get :issues
get :merge_requests get :merge_requests
get :search get :search
post :delegate_projects
delete :relegate_project
put :update_access
end end
scope module: :teams do scope module: :teams do
resources :members resources :members, only: [:index, :new, :create, :edit, :update, :destroy]
resources :projects, only: [:index, :show] do resources :projects, only: [:index, :new, :create, :edit, :update, :destroy], constraints: { id: /[a-zA-Z.0-9_\-\/]+/ }
end
end end
collection do collection do
get :search get :search