diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-07-23 20:52:44 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-07-23 20:52:44 +0000 |
| commit | 63f39602dadd56da068a81684f73f5415e5ac926 (patch) | |
| tree | 04cfdbf06ed1dfab364726101089fe335c44c638 /app/views | |
| parent | 8d684d8f2efd4b277b5db7998d973ac87d6ba27d (diff) | |
| parent | ab419b08ce7741f3471439a9b912fdb504130615 (diff) | |
| download | gitlab-ce-63f39602dadd56da068a81684f73f5415e5ac926.tar.gz | |
Merge branch 'add-gitlab-workhorse-version-to-admin-dashboard' into 'master'
Add gitlab-workhorse version to admin dashboard
## What does this MR do?
Add gitlab-workhorse version to admin dashboard.
## What are the relevant issue numbers?
Closes #15418
## Screenshot
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Add test - show Gitlab Workhorse version on Admin Dashboard
- [x] All builds are passing
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
cc @ubudzisz @yorickpeterse @grzesiek [@chastell](https://github.com/chastell) [@tomash](https://github.com/tomash)
See merge request !5321
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/dashboard/index.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index a2ac407c159..452fc25ab07 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -80,6 +80,10 @@ %span.pull-right = Gitlab::Shell.new.version %p + GitLab Workhorse + %span.pull-right + = Gitlab::Workhorse.version + %p GitLab API %span.pull-right = API::API::version |