diff options
author | Nick Thomas <nick@gitlab.com> | 2018-04-16 12:10:24 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-04-16 12:10:24 +0000 |
commit | 25cb70ba6087d86343a127df88394fbe97b381b1 (patch) | |
tree | 0f6c341816969da2459361c11171af511c048b90 /spec/views | |
parent | 4fcee58636259e523a0e1b85e2090160a3938496 (diff) | |
parent | a3234f410ebb0a592bed68fe8b2cf7fd7a8678c9 (diff) | |
download | gitlab-ce-25cb70ba6087d86343a127df88394fbe97b381b1.tar.gz |
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
Diffstat (limited to 'spec/views')
-rw-r--r-- | spec/views/admin/dashboard/index.html.haml_spec.rb | 6 |
1 files changed, 6 insertions, 0 deletions
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 |