diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-05-19 20:42:43 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-05-19 20:42:43 +0000 |
| commit | bd0cecfdf6ec504421b44f1174040c5003c13f65 (patch) | |
| tree | 200c89a047765c7578bc34c16065d8b2ee81980a /config | |
| parent | 53e2d30af4f5a23d4f58c051293188e891c385fa (diff) | |
| parent | 4f1c63683175fa88ca41ba2180b68e266d7118e4 (diff) | |
| download | gitlab-ce-bd0cecfdf6ec504421b44f1174040c5003c13f65.tar.gz | |
Merge branch 'with-pipeline-view' into 'master'
Add pipeline view
This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3653
cc @DouweM @grzesiek
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17551
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15625
See merge request !3703
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 18e62bc4455..d8a2435b078 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -666,6 +666,13 @@ Rails.application.routes.draw do resources :variables, only: [:index, :show, :update, :create, :destroy] resources :triggers, only: [:index, :create, :destroy] + resources :pipelines, only: [:index, :new, :create, :show] do + member do + post :cancel + post :retry + end + end + resources :builds, only: [:index, :show], constraints: { id: /\d+/ } do collection do post :cancel_all |