summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-07 16:20:31 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-07 16:20:31 +0200
commita30b68fe1ded96c5aafe4348d1afec269354c469 (patch)
tree20051e46b2d00d40cf73e2ef36e0005841d49063 /config
parent1e06cabf4a8fa4d4c7acb9898682a5b4b41a9f58 (diff)
downloadgitlab-ce-a30b68fe1ded96c5aafe4348d1afec269354c469.tar.gz
Move CI services to project settings area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 4fb779e297c..e91b09de9b0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -22,12 +22,6 @@ Gitlab::Application.routes.draw do
get :dumped_yaml
end
- resources :services, only: [:index, :edit, :update] do
- member do
- get :test
- end
- end
-
resources :runner_projects, only: [:create, :destroy]
resources :events, only: [:index]
@@ -576,6 +570,12 @@ Gitlab::Application.routes.draw do
end
end
+ resources :ci_services, constraints: { id: /[^\/]+/ }, only: [:index, :edit, :update] do
+ member do
+ get :test
+ end
+ end
+
resources :builds, only: [:show] do
member do
get :cancel