Include git SHA with GitLab version
This commit is contained in:
parent
947ed8b882
commit
a3234f410e
|
@ -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
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
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
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue