diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-20 10:29:56 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-20 10:29:56 +0000 |
| commit | 7cd2d52829a602606f0b0e9e41498a9bad6fae92 (patch) | |
| tree | 1d0f2d389367353aa22824ee53ccbaa25bdc2b36 | |
| parent | 96bb281c2fd357af0353c027a7a76f625ac2bee8 (diff) | |
| parent | e9771e6842594fcb576139ecaac28918366046c1 (diff) | |
| download | gitlab-ce-7cd2d52829a602606f0b0e9e41498a9bad6fae92.tar.gz | |
Merge branch '36884-gitaly-admin-version' into 'master'
Add Gitaly version to Admin Dashboard
Closes #36884
See merge request gitlab-org/gitlab-ce!14313
| -rw-r--r-- | app/assets/stylesheets/pages/admin.scss | 6 | ||||
| -rw-r--r-- | app/views/admin/dashboard/index.html.haml | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/36884-gitaly-admin-version.yml | 5 |
3 files changed, 17 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/admin.scss b/app/assets/stylesheets/pages/admin.scss new file mode 100644 index 00000000000..6c555aee20a --- /dev/null +++ b/app/assets/stylesheets/pages/admin.scss @@ -0,0 +1,6 @@ +.info-well { + .admin-well-statistics, + .admin-well-features { + padding-bottom: 46px; + } +} diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 703f4165128..d212c7ca965 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -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 diff --git a/changelogs/unreleased/36884-gitaly-admin-version.yml b/changelogs/unreleased/36884-gitaly-admin-version.yml new file mode 100644 index 00000000000..0b3b9a205b5 --- /dev/null +++ b/changelogs/unreleased/36884-gitaly-admin-version.yml @@ -0,0 +1,5 @@ +--- +title: Add Gitaly version to Admin Dashboard +merge_request: 14313 +author: Jacopo Beschi @jacopo-beschi +type: added |