Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-07-27 16:12:35 +0300
committerSean McGivern <sean@mcgivern.me.uk>2018-07-27 16:12:35 +0300
commited81ee9ba2b5a0b68996ccb238bfa4c69a6df062 (patch)
tree831e186cd5ed4072a0883c4eac563cbcd9c70f23 /config
parent636ea40e182fca92e89facbcb52445fcefef9506 (diff)
Revert "Merge branch '41416-making-instance-wide-data-tools-more-accessible' into 'master'"
This reverts merge request !20679
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb2
-rw-r--r--config/routes/admin.rb4
-rw-r--r--config/routes/instance_statistics.rb6
3 files changed, 4 insertions, 8 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 63e40a31b76..e0a9139b1b4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -70,8 +70,6 @@ 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 7ee960970f8..109f00631fb 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -76,6 +76,8 @@ 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',
@@ -121,6 +123,8 @@ 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
deleted file mode 100644
index d8516649bc8..00000000000
--- a/config/routes/instance_statistics.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace :instance_statistics do
- root to: redirect('/-/instance_statistics/conversational_development_index')
-
- resources :cohorts, only: :index
- resources :conversational_development_index, only: :index
-end