diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /config/routes.rb | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/config/routes.rb b/config/routes.rb index 9bd68bfeef6..87d32e3d89a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -69,10 +69,6 @@ Rails.application.routes.draw do # Begin of the /-/ scope. # Use this scope for all new global routes. scope path: '-' do - # remove in 13.5 - get '/instance_statistics', to: redirect('admin/dev_ops_report') - get '/instance_statistics/dev_ops_score', to: redirect('admin/dev_ops_report') - get '/instance_statistics/cohorts', to: redirect('admin/cohorts') # Autocomplete get '/autocomplete/users' => 'autocomplete#users' get '/autocomplete/users/:id' => 'autocomplete#user' @@ -87,12 +83,16 @@ Rails.application.routes.draw do get '/autocomplete/namespace_routes' => 'autocomplete#namespace_routes' end + get '/whats_new' => 'whats_new#index' + # '/-/health' implemented by BasicHealthCheck middleware get 'liveness' => 'health#liveness' get 'readiness' => 'health#readiness' resources :metrics, only: [:index] mount Peek::Railtie => '/peek', as: 'peek_routes' + get 'runner_setup/platforms' => 'runner_setup#platforms' + # Boards resources shared between group and projects resources :boards, only: [] do resources :lists, module: :boards, only: [:index, :create, :update, :destroy] do @@ -122,6 +122,7 @@ Rails.application.routes.draw do get 'ide' => 'ide#index' get 'ide/*vueroute' => 'ide#index', format: false + get 'ide/project/:namespace/:project/merge_requests/:id' => 'ide#index', format: false, as: :ide_merge_request draw :operations draw :jira_connect @@ -275,6 +276,14 @@ Rails.application.routes.draw do draw :snippets end + # Serve profile routes under /-/ scope. + # To ensure an old unscoped routing is used for the UI we need to + # add prefix 'as' to the scope routing and place it below original routing. + # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/210024 + scope '-', as: :scoped do + draw :profile + end + root to: "root#index" get '*unmatched_route', to: 'application#route_not_found' |