diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 18:07:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 18:07:48 +0000 |
| commit | b5571e6e22cdacc81f78eff5943d68c8ba220fbb (patch) | |
| tree | 3677b792f5afe0b4853cee59e166df961993b7e8 /config | |
| parent | f92a53a216e6e7d5037ac701efbee5628f91aa9a (diff) | |
| download | gitlab-ce-b5571e6e22cdacc81f78eff5943d68c8ba220fbb.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index e8ad8ba2a63..9e40e891fd5 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -58,6 +58,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get :trace, defaults: { format: 'json' } get :raw get :terminal + + # This route is also defined in gitlab-workhorse. Make sure to update accordingly. get '/terminal.ws/authorize', to: 'jobs#terminal_websocket_authorize', format: false end @@ -235,6 +237,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get :metrics get :additional_metrics get :metrics_dashboard + + # 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 |