summaryrefslogtreecommitdiff
path: root/config/routes.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-07 09:13:38 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-07 09:13:38 +0000
commit0611a18964a998b6edc81ef9b469f9f70430e542 (patch)
tree62a32b8d4169e22583284916b99a0e216ad74d8c /config/routes.rb
parentad627e40dcb00b54761a60078448286667a179fd (diff)
parent8dcc8e5db61b602baaf6390c6cbbaa28d49b3ee1 (diff)
downloadgitlab-ce-0611a18964a998b6edc81ef9b469f9f70430e542.tar.gz
Merge branch 'ci-build-page' into 'master'
Move CI build page to CE project * move CI build page to project * cleanup unused code * fix few 500 errors (build cancel and few CI admin pages) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1524
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/config/routes.rb b/config/routes.rb
index beebb3258d1..ccce40589e7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -28,16 +28,14 @@ Gitlab::Application.routes.draw do
end
end
- resource :charts, only: [:show]
-
- resources :commits, only: [:show] do
+ resources :commits, only: [] do
member do
get :status
get :cancel
end
end
- resources :builds, only: [:show] do
+ resources :builds, only: [] do
member do
get :cancel
get :status
@@ -592,6 +590,8 @@ Gitlab::Application.routes.draw do
end
end
+ resources :builds, only: [:show]
+
resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ } do
member do
get :test