Add latest changes from gitlab-org/gitlab@master

3 files changed, 8 insertions, 9 deletions

diff --git a/config/routes.rb b/config/routes.rb
index b1ab4ec6bab..6fd9a969907 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -72,6 +72,10 @@ 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_score')
+    get '/instance_statistics/dev_ops_score', to: redirect('admin/dev_ops_score')
+    get '/instance_statistics/cohorts', to: redirect('admin/cohorts')
     # Autocomplete
     get '/autocomplete/users' => 'autocomplete#users'
     get '/autocomplete/users/:id' => 'autocomplete#user'
@@ -123,7 +127,6 @@ Rails.application.routes.draw do
     get 'ide/*vueroute' => 'ide#index', format: false
 
     draw :operations
-    draw :instance_statistics
 
     Gitlab.ee do
       draw :security
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index f3b7fb5ed45..258a6a04221 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -89,6 +89,10 @@ namespace :admin do
 
   resources :projects, only: [:index]
 
+  resources :instance_statistics, only: :index
+  resource :dev_ops_score, controller: 'dev_ops_score', only: :show
+  resources :cohorts, only: :index
+
   scope(path: 'projects/*namespace_id',
         as: :namespace,
         constraints: { namespace_id: Gitlab::PathRegex.full_namespace_route_regex }) do
diff --git a/config/routes/instance_statistics.rb b/config/routes/instance_statistics.rb
deleted file mode 100644
index 967255d5b82..00000000000
--- a/config/routes/instance_statistics.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-namespace :instance_statistics do
-  root to: redirect('-/instance_statistics/dev_ops_score')
-
-  resources :cohorts, only: :index
-  resources :dev_ops_score, only: :index
-end