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

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

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

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