Commit b7e3b762 authored by Denys Mishunov's avatar Denys Mishunov

Merge branch 'afontaine/add-changelog-to-admin' into 'master'

Add link to GitLab Changelog With Version Check

See merge request gitlab-org/gitlab!66486
parents 96a2ad4a c70f0e82
...@@ -118,6 +118,7 @@ ...@@ -118,6 +118,7 @@
- if Gitlab::CurrentSettings.version_check_enabled - if Gitlab::CurrentSettings.version_check_enabled
.float-right .float-right
= version_status_badge = version_status_badge
= link_to(sprite_icon('question'), "https://gitlab.com/gitlab-org/gitlab/-/blob/master/CHANGELOG.md", class: 'gl-ml-2', target: '_blank', rel: 'noopener noreferrer')
%p %p
= link_to _('GitLab'), general_admin_application_settings_path = link_to _('GitLab'), general_admin_application_settings_path
%span.float-right %span.float-right
......
...@@ -52,4 +52,12 @@ RSpec.describe 'admin/dashboard/index.html.haml' do ...@@ -52,4 +52,12 @@ RSpec.describe 'admin/dashboard/index.html.haml' do
expect(rendered).not_to have_content "Maximum Users" expect(rendered).not_to have_content "Maximum Users"
expect(rendered).not_to have_content "Users over License" expect(rendered).not_to have_content "Users over License"
end end
it 'links to the GitLab Changelog' do
stub_application_setting(version_check_enabled: true)
render
expect(rendered).to have_link(href: 'https://gitlab.com/gitlab-org/gitlab/-/blob/master/CHANGELOG.md')
end
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