Commit a3234f41 authored by Ash McKenzie's avatar Ash McKenzie

Include git SHA with GitLab version

parent 947ed8b8
...@@ -126,6 +126,7 @@ ...@@ -126,6 +126,7 @@
GitLab GitLab
%span.pull-right %span.pull-right
= Gitlab::VERSION = Gitlab::VERSION
= "(#{Gitlab::REVISION})"
%p %p
GitLab Shell GitLab Shell
%span.pull-right %span.pull-right
......
---
title: git SHA is now displayed alongside the GitLab version on the Admin Dashboard
merge_request:
author:
type: added
...@@ -18,4 +18,10 @@ describe 'admin/dashboard/index.html.haml' do ...@@ -18,4 +18,10 @@ describe 'admin/dashboard/index.html.haml' do
expect(rendered).to have_content 'GitLab Workhorse' expect(rendered).to have_content 'GitLab Workhorse'
expect(rendered).to have_content Gitlab::Workhorse.version expect(rendered).to have_content Gitlab::Workhorse.version
end end
it "includes revision of GitLab" do
render
expect(rendered).to have_content "#{Gitlab::VERSION} (#{Gitlab::REVISION})"
end
end end
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