Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-08-17 19:49:42 +0300
committerRuben Davila <rdavila84@gmail.com>2016-08-17 23:10:37 +0300
commiteaf8ae2eddec233374693d67d3d3c9c75d180763 (patch)
tree28de35454bf317167bbcd58f9da932b8f74dfd6a /config
parent58e25cb349bd1f20ee7cff410f59501ef3ed3616 (diff)
Merge branch '18681-pipelines-merge-request' into 'master'
Resolve "Pipelines for merge request" ## What does this MR do? Adds `Pipelines` tab in merge request view ## What are the relevant issue numbers? Closes #18681 ## Screenshots (if relevant) ![Screen_Shot_2016-08-16_at_3.22.41_PM](/uploads/c04febab3765b1fac2bf3bbfb9882f9f/Screen_Shot_2016-08-16_at_3.22.41_PM.png) See merge request !5485
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 293d9e69813..f2c51706e25 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -723,6 +723,7 @@ Rails.application.routes.draw do
get :commits
get :diffs
get :builds
+ get :pipelines
get :merge_check
post :merge
post :cancel_merge_when_build_succeeds