summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-28 09:14:28 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-28 09:14:28 +0200
commit3de4271846496fae3b16c316252816dca3f3c354 (patch)
treeb5326276474caccfdf5098da71fa3982c770ba4a /config
parentc29457a396036b6e46b211378f6416e2f54bc739 (diff)
parent655b836b2ac26e7afabeb7faaabb56cf106348d7 (diff)
downloadgitlab-ce-3de4271846496fae3b16c316252816dca3f3c354.tar.gz
Merge branch 'feature/add_user_to_projects_in_group-2298' of https://github.com/zzet/gitlabhq into zzet-feature/add_user_to_projects_in_group-2298
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 4317962f607..4a02bd9f809 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -47,6 +47,7 @@ Gitlab::Application.routes.draw do
resources :groups, constraints: { id: /[^\/]+/ } do
member do
put :project_update
+ put :project_teams_update
delete :remove_project
end
end
@@ -102,6 +103,7 @@ Gitlab::Application.routes.draw do
get :merge_requests
get :search
get :people
+ post :team_members
end
end