diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-27 16:03:50 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-27 16:03:50 +0300 |
commit | 636ea40e182fca92e89facbcb52445fcefef9506 (patch) | |
tree | c555ba8f65dd8c468c0539b32836ad65f67e731b /config | |
parent | 31044d41a63dd1b8f57df12b864210d84361c219 (diff) | |
parent | a79094b29205929ab78d89e10e768787f7aff7d6 (diff) |
Merge branch '41416-making-instance-wide-data-tools-more-accessible' into 'master'
Resolve "Making instance-wide data tools more accessible"
Closes #41416 and #48507
See merge request gitlab-org/gitlab-ce!20679
Diffstat (limited to 'config')
-rw-r--r-- | config/routes.rb | 2 | ||||
-rw-r--r-- | config/routes/admin.rb | 4 | ||||
-rw-r--r-- | config/routes/instance_statistics.rb | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/config/routes.rb b/config/routes.rb index e0a9139b1b4..63e40a31b76 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -70,6 +70,8 @@ Rails.application.routes.draw do get 'ide' => 'ide#index' get 'ide/*vueroute' => 'ide#index', format: false + + draw :instance_statistics end # Koding route diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 109f00631fb..7ee960970f8 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -76,8 +76,6 @@ namespace :admin do resource :system_info, controller: 'system_info', only: [:show] resources :requests_profiles, only: [:index, :show], param: :name, constraints: { name: /.+\.html/ } - get 'conversational_development_index' => 'conversational_development_index#show' - resources :projects, only: [:index] scope(path: 'projects/*namespace_id', @@ -123,8 +121,6 @@ namespace :admin do end end - resources :cohorts, only: :index - resources :jobs, only: :index do collection do post :cancel_all diff --git a/config/routes/instance_statistics.rb b/config/routes/instance_statistics.rb new file mode 100644 index 00000000000..d8516649bc8 --- /dev/null +++ b/config/routes/instance_statistics.rb @@ -0,0 +1,6 @@ +namespace :instance_statistics do + root to: redirect('/-/instance_statistics/conversational_development_index') + + resources :cohorts, only: :index + resources :conversational_development_index, only: :index +end |