Merge branch 'cleanup-ci-pages' into 'master'

Cleanup CI pages

- [x] Remove `ci/projects/:id` page
- [x] Remove Continuous integration from project menu
- [x] Remove unused css/js
- [x] Remove Ci::Commit and Ci::Build controllers
- [x] Move CI services to project settings area


cc @ayufan 

Part of #2594

See merge request !1529

1 files changed, 14 insertions, 22 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 035b996dd7a..8e6fbf6340c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -22,27 +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 :commits, only: [] do
-        member do
-          get :status
-          get :cancel
-        end
-      end
-
-      resources :builds, only: [] do
-        member do
-          get :cancel
-          get :status
-          post :retry
-        end
-      end
-
       resources :runner_projects, only: [:create, :destroy]
 
       resources :events, only: [:index]
@@ -495,6 +474,7 @@ Gitlab::Application.routes.draw do
           member do
             get :branches
             get :ci
+            get :cancel_builds
           end
         end
 
@@ -599,7 +579,19 @@ Gitlab::Application.routes.draw do
           end
         end
 
-        resources :builds, only: [:show]
+        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
+            get :status
+            post :retry
+          end
+        end
 
         resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ } do
           member do