Commit 302feddc authored by Nick Thomas's avatar Nick Thomas

Merge branch 'dz-mention-workhorse-routes' into 'master'

Mention workhorse depended routing

See merge request gitlab-org/gitlab!22093
parents 90fd4c9c d8b88b79
...@@ -58,6 +58,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do ...@@ -58,6 +58,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
get :trace, defaults: { format: 'json' } get :trace, defaults: { format: 'json' }
get :raw get :raw
get :terminal 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 get '/terminal.ws/authorize', to: 'jobs#terminal_websocket_authorize', format: false
end end
...@@ -235,6 +237,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do ...@@ -235,6 +237,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
get :metrics get :metrics
get :additional_metrics get :additional_metrics
get :metrics_dashboard 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 '/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#proxy', as: :prometheus_api
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment