diff options
author | Sean McGivern <sean@gitlab.com> | 2019-06-11 11:26:01 +0000 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-06-11 11:26:01 +0000 |
commit | 83d8af2435034791ac0677d40807b3be4c3130be (patch) | |
tree | d34e48b64a9676350efe72527bbc5d4e84438d61 /config | |
parent | df000f03a98fa8bf21415ffc3babba6ccc11d86e (diff) | |
parent | ecdc50b198796275b5f0862c5cdb0dca5aac1213 (diff) | |
download | gitlab-ce-83d8af2435034791ac0677d40807b3be4c3130be.tar.gz |
Merge branch 'prom-api-1' into 'master'
Update server API to enable switch prometheus endpoint
See merge request gitlab-org/gitlab-ce!29186
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index d44ff62bc2a..a1e769f6ca3 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -330,7 +330,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get :metrics_dashboard get '/terminal.ws/authorize', to: 'environments#terminal_websocket_authorize', constraints: { format: nil } - get '/prometheus/api/v1/*proxy_path', to: 'environments/prometheus_api#proxy' + get '/prometheus/api/v1/*proxy_path', to: 'environments/prometheus_api#proxy', as: :prometheus_api end collection do |