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:
authorKamil Trzciński <ayufan@ayufan.eu>2017-03-27 15:21:22 +0300
committerKamil Trzciński <ayufan@ayufan.eu>2017-03-27 15:21:22 +0300
commit8391fa37f00e99851ff601c16bd7484499dc4f99 (patch)
treede18e940dc974c5278cdbdd5eccee7bd4cf2ee78 /config
parent856d29918b089cf56b0cf590c46eb559627d39ce (diff)
parentb3375a49647853f45df11b464bf7aa3e34af0f88 (diff)
Merge branch '12818-expose-simple-cicd-status-endpoints-with-status-serializer-gitlab-ci-status-for-pipeline-job-and-merge-request' into 'master'
Expose CI/CD status API endpoints with Gitlab::Ci::Status facility on pipeline, job and merge request for favicon See merge request !9561
Diffstat (limited to 'config')
-rw-r--r--config/routes/project.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 44b8ae7aedd..823e0614aeb 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -102,6 +102,7 @@ constraints(ProjectUrlConstrainer.new) do
get :merge_widget_refresh
post :cancel_merge_when_pipeline_succeeds
get :ci_status
+ get :pipeline_status
get :ci_environments_status
post :toggle_subscription
post :remove_wip
@@ -152,6 +153,7 @@ constraints(ProjectUrlConstrainer.new) do
post :cancel
post :retry
get :builds
+ get :status
end
end