diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 16:54:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 16:54:15 +0300 |
commit | be834a25982746ffd85252ff502df42bb88cb9d5 (patch) | |
tree | b4d6a8ba0931e12fac08f05abea33a3b8ec2c8a2 /config/routes.rb | |
parent | ee925a3597f27e92f83a50937a64068109675b3d (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc32
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/config/routes.rb b/config/routes.rb index 9bd68bfeef6..dda505a3793 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' @@ -93,6 +89,8 @@ Rails.application.routes.draw do 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 +120,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 |