diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-03 03:09:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-03 03:09:23 +0300 |
| commit | 57b359e90cc658221ace134673d86aa1d70ac878 (patch) | |
| tree | db5a6830b5190f2e7fca2cd9ab4a1dcd64594153 /config/routes | |
| parent | 2c0e92d0314ca00907b75b103af507d9a28a2d62 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/routes')
| -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 0ad4d7e0ea0..d2fe2be48e5 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -257,7 +257,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do # This route is also defined in gitlab-workhorse. Make sure to update accordingly. get '/terminal.ws/authorize', to: 'environments#terminal_websocket_authorize', format: false - get '/prometheus/api/v1/*proxy_path', to: 'environments/prometheus_api#proxy', as: :prometheus_api + get '/prometheus/api/v1/*proxy_path', to: 'environments/prometheus_api#prometheus_proxy', as: :prometheus_api get '/sample_metrics', to: 'environments/sample_metrics#query' end |