summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-01-31 11:31:29 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-01-31 11:31:29 +0000
commit5d8bb33d48826abc7cd348a7c151c5b6985f0ade (patch)
tree24fdd6e911e931888c7786302016e603543c68f7 /app/controllers
parent4251c6565fa18ecd64befe3a2561df30d48d1846 (diff)
parent94a3dbca33634dd4f6a1de8b14cd2a4f0a9a0abc (diff)
downloadgitlab-ce-5d8bb33d48826abc7cd348a7c151c5b6985f0ade.tar.gz
Merge branch 'zj-gitaly-server-info' into 'master'
Gitaly Server info for admin panel See merge request gitlab-org/gitlab-ce!16794
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/admin/gitaly_servers_controller.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/admin/gitaly_servers_controller.rb b/app/controllers/admin/gitaly_servers_controller.rb
new file mode 100644
index 00000000000..11c4dfe3d8d
--- /dev/null
+++ b/app/controllers/admin/gitaly_servers_controller.rb
@@ -0,0 +1,5 @@
+class Admin::GitalyServersController < Admin::ApplicationController
+ def index
+ @gitaly_servers = Gitaly::Server.all
+ end
+end