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

3 files changed, 12 insertions, 0 deletions

diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 05c41082882..bbf0e0fb95c 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -126,6 +126,7 @@
               GitLab
               %span.pull-right
                 = Gitlab::VERSION
+                = "(#{Gitlab::REVISION})"
             %p
               GitLab Shell
               %span.pull-right
diff --git a/changelogs/unreleased/ash-mckenzie-include-sha-with-version.yml b/changelogs/unreleased/ash-mckenzie-include-sha-with-version.yml
new file mode 100644
index 00000000000..b49c48e0fe1
--- /dev/null
+++ b/changelogs/unreleased/ash-mckenzie-include-sha-with-version.yml
@@ -0,0 +1,5 @@
+---
+title: git SHA is now displayed alongside the GitLab version on the Admin Dashboard
+merge_request:
+author:
+type: added
diff --git a/spec/views/admin/dashboard/index.html.haml_spec.rb b/spec/views/admin/dashboard/index.html.haml_spec.rb
index b4359d819a0..099baacf019 100644
--- a/spec/views/admin/dashboard/index.html.haml_spec.rb
+++ b/spec/views/admin/dashboard/index.html.haml_spec.rb
@@ -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