summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-01-20 12:58:47 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-01-20 12:58:47 +0100
commit5f84368cba3e5c517b20fc6956a742bcd10569f8 (patch)
tree16f871b1da85e184d8e66cb13fdcf395c8020623 /config
parent3f445c8bd716d93c83310fd83ca8500ec9cfab4d (diff)
downloadgitlab-ce-5f84368cba3e5c517b20fc6956a742bcd10569f8.tar.gz
Revert removing builds tab on '8-16-stable'fix/revert-removing-build-tab-again
This reverts commit 79a816f3bca839aadbaf7af92ac0c0d30dc8a8b7, reversing changes made to 68d89aa96b1ae7ea742cc5ac708bd8d08492826b. Conflicts: app/views/projects/merge_requests/_show.html.haml
Diffstat (limited to 'config')
-rw-r--r--config/routes/project.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 1fc6ed28c74..c5e7f98d7af 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -32,7 +32,10 @@ constraints(ProjectUrlConstrainer.new) do
resources :commit, only: [:show], constraints: { id: /\h{7,40}/ } do
member do
get :branches
+ get :builds
get :pipelines
+ post :cancel_builds
+ post :retry_builds
post :revert
post :cherry_pick
get :diff_for_path
@@ -91,6 +94,7 @@ constraints(ProjectUrlConstrainer.new) do
get :diffs
get :conflicts
get :conflict_for_path
+ get :builds
get :pipelines
get :merge_check
post :merge