Commit 208ac01a authored by Robert Speicher's avatar Robert Speicher

Merge branch 'cs-fix-commercial-content-check' into 'master'

Include the GitLab version info when commercial content on help page is disabled

Closes #42486

See merge request gitlab-org/gitlab-ce!16743
parents 6c978c8f 948311f7
...@@ -5,15 +5,16 @@ ...@@ -5,15 +5,16 @@
= markdown_field(current_application_settings, :help_page_text) = markdown_field(current_application_settings, :help_page_text)
%hr %hr
- unless current_application_settings.help_page_hide_commercial_content? %h1
%h1
GitLab GitLab
Community Edition Community Edition
- if user_signed_in? - if user_signed_in?
%span= Gitlab::VERSION %span= Gitlab::VERSION
%small= link_to Gitlab::REVISION, Gitlab::COM_URL + namespace_project_commits_path('gitlab-org', 'gitlab-ce', Gitlab::REVISION) %small= link_to Gitlab::REVISION, Gitlab::COM_URL + namespace_project_commits_path('gitlab-org', 'gitlab-ce', Gitlab::REVISION)
= version_status_badge = version_status_badge
%hr
- unless current_application_settings.help_page_hide_commercial_content?
%p.slead %p.slead
GitLab is open source software to collaborate on code. GitLab is open source software to collaborate on code.
%br %br
......
---
title: Fix version information not showing on help page if commercial content display
was disabled.
merge_request: 16743
author:
type: fixed
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