Commit 7cd2d528 authored by Tim Zallmann's avatar Tim Zallmann

Merge branch '36884-gitaly-admin-version' into 'master'

Add Gitaly version to Admin Dashboard

Closes #36884

See merge request gitlab-org/gitlab-ce!14313
parents 96bb281c e9771e68
.info-well {
.admin-well-statistics,
.admin-well-features {
padding-bottom: 46px;
}
}
......@@ -7,7 +7,7 @@
.row
.col-md-4
.info-well
.well-segment.admin-well
.well-segment.admin-well.admin-well-statistics
%h4 Statistics
%p
Forks
......@@ -43,7 +43,7 @@
= number_with_delimiter(User.active.count)
.col-md-4
.info-well
.well-segment.admin-well
.well-segment.admin-well.admin-well-features
%h4 Features
- sign_up = "Sign up"
%p{ "aria-label" => "#{sign_up}: status " + (signup_enabled? ? "on" : "off") }
......@@ -111,6 +111,10 @@
GitLab API
%span.pull-right
= API::API::version
%p
Gitaly
%span.pull-right
= Gitlab::GitalyClient.expected_server_version
- if Gitlab.config.pages.enabled
%p
GitLab Pages
......
---
title: Add Gitaly version to Admin Dashboard
merge_request: 14313
author: Jacopo Beschi @jacopo-beschi
type: added
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment