Commit f0d15cad authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'link-to-version' into 'master'

Link to revision in the version on admin dashboard

See merge request gitlab-org/gitlab!58225
parents 0c78bd7a 3cf7abcd
...@@ -119,8 +119,7 @@ ...@@ -119,8 +119,7 @@
%p %p
= link_to _('GitLab'), general_admin_application_settings_path = link_to _('GitLab'), general_admin_application_settings_path
%span.float-right %span.float-right
= Gitlab::VERSION = link_to_version
= "(#{Gitlab.revision})"
%p %p
= _('GitLab Shell') = _('GitLab Shell')
%span.float-right %span.float-right
......
---
title: Link to revision in version on admin dashboard
merge_request: 58225
author: Yogi (@yo)
type: changed
...@@ -29,7 +29,7 @@ RSpec.describe 'admin/dashboard/index.html.haml' do ...@@ -29,7 +29,7 @@ RSpec.describe 'admin/dashboard/index.html.haml' do
it "includes revision of GitLab" do it "includes revision of GitLab" do
render render
expect(rendered).to have_content "#{Gitlab::VERSION} (#{Gitlab.revision})" expect(rendered).to have_content "#{Gitlab::VERSION} #{Gitlab.revision}"
end end
it 'does not include license breakdown' do it 'does not include license breakdown' do
......
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