summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2019-05-07 07:08:52 +0000
committerBob Van Landuyt <bob@gitlab.com>2019-05-07 07:08:52 +0000
commit3371c1cb7102ec557065ea7e92b9f6fff9744bd1 (patch)
tree8421a6ac36b6318d96573c1325212a332d0aa847 /config
parent5925b5bbdb0ffddf4ab8be84b84747a65c2aec3c (diff)
parentf07d445b0c3296b3070221ccd70443fba15ba708 (diff)
downloadgitlab-ce-3371c1cb7102ec557065ea7e92b9f6fff9744bd1.tar.gz
Merge branch 'instance_level_clusters' into 'master'
Instance level k8s clusters See merge request gitlab-org/gitlab-ce!27196
Diffstat (limited to 'config')
-rw-r--r--config/routes/admin.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index a01003b6039..90d7f4a04d4 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -132,5 +132,7 @@ namespace :admin do
end
end
+ concerns :clusterable
+
root to: 'dashboard#index'
end