summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2015-10-15 11:35:57 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2015-10-15 11:35:57 +0000
commitdaccc54d25a5acfd089e02fd7387ed14f0a3a629 (patch)
tree23022a603117e114ea608c7fa3e842a615f8faf6 /config
parent524b3db30ca53449c13cb6bb9a518cfc2c0cacf7 (diff)
parent9fa209e1d8748b1eb1ef041bb1c40d30914f2815 (diff)
downloadgitlab-ce-daccc54d25a5acfd089e02fd7387ed14f0a3a629.tar.gz
Merge branch 'builds-view' into 'master'
Added builds view ![Screen_Shot_2015-10-13_at_19.02.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/95bb3a7d9d603678fdd077558637045d/Screen_Shot_2015-10-13_at_19.02.48.png) /cc @dzaporozhets @vsizov See merge request !1593
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 893ab59c327..3dbe2c4dfcc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -587,7 +587,11 @@ Gitlab::Application.routes.draw do
end
end
- resources :builds, only: [:show] do
+ resources :builds, only: [:index, :show] do
+ collection do
+ get :cancel_all
+ end
+
member do
get :cancel
get :status