summaryrefslogtreecommitdiff
path: root/config/routes
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-04-19 14:48:31 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-04-19 14:48:31 +0000
commit40a972057da58dd5c15cf0f0b2952f264dba0076 (patch)
treec454dd64d0e8af557ad9bf71337ad5c4014efbef /config/routes
parenta9da37434af6d44c5f851affd4bd69b370760e8e (diff)
parent5f570690d4cf5635eb41ec43f21bdf21f79c5dda (diff)
downloadgitlab-ce-40a972057da58dd5c15cf0f0b2952f264dba0076.tar.gz
Merge branch 'usage-ping-port' into 'master'
Usage ping port Closes #27750 See merge request !10481
Diffstat (limited to 'config/routes')
-rw-r--r--config/routes/admin.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 486ce3c5c87..52ba10604d4 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -91,6 +91,7 @@ namespace :admin do
resource :application_settings, only: [:show, :update] do
resources :services, only: [:index, :edit, :update]
+ get :usage_data
put :reset_runners_token
put :reset_health_check_token
put :clear_repository_check_states
@@ -105,6 +106,8 @@ namespace :admin do
end
end
+ resources :cohorts, only: :index
+
resources :builds, only: :index do
collection do
post :cancel_all