Commit 25cb70ba authored by Nick Thomas's avatar Nick Thomas

Merge branch 'ash.mckenzie/include-sha-with-version' into 'master'

Include git SHA with GitLab version on Admin Dashboard

See merge request gitlab-org/gitlab-ce!18331
parents 4fcee586 a3234f41
......@@ -126,6 +126,7 @@
GitLab
%span.pull-right
= Gitlab::VERSION
= "(#{Gitlab::REVISION})"
%p
GitLab Shell
%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
expect(rendered).to have_content 'GitLab Workhorse'
expect(rendered).to have_content Gitlab::Workhorse.version
end
it "includes revision of GitLab" do
render
expect(rendered).to have_content "#{Gitlab::VERSION} (#{Gitlab::REVISION})"
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