diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /config/routes.rb | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 38030a24cb5..1258675df86 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -179,6 +179,7 @@ Rails.application.routes.draw do get :db_spin get :sleep get :kill + get :quit post :gc end end @@ -220,6 +221,12 @@ Rails.application.routes.draw do post :authorize_aws_role end + resource :integration, controller: 'clusters/integrations', only: [] do + collection do + post :create_or_update + end + end + member do Gitlab.ee do get :metrics, format: :json @@ -284,6 +291,7 @@ Rails.application.routes.draw do draw :git_http draw :api + draw :customers_dot draw :sidekiq draw :help draw :google_api |