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

Port of cs-fix-commercial-content-check to EE.

See merge request gitlab-org/gitlab-ee!4290

app/views/help/index.html.haml

@@ -5,16 +5,16 @@
   = markdown(current_application_settings.help_page_text)
   %hr
 
-- unless current_application_settings.help_page_hide_commercial_content?
-  %h1
-    GitLab
-    Enterprise Edition
-    - if user_signed_in?
-      %span= Gitlab::VERSION
-      %small= link_to Gitlab::REVISION, Gitlab::COM_URL + namespace_project_commits_path('gitlab-org', 'gitlab-ee', Gitlab::REVISION)
-      - if current_application_settings.version_check_enabled
-        = version_status_badge
+%h1
+GitLab
+Enterprise Edition
+- if user_signed_in?
+  %span= Gitlab::VERSION
+  %small= link_to Gitlab::REVISION, Gitlab::COM_URL + namespace_project_commits_path('gitlab-org', 'gitlab-ee', Gitlab::REVISION)
+  - if current_application_settings.version_check_enabled
+    = version_status_badge
 
+- unless current_application_settings.help_page_hide_commercial_content?
   %p.slead
     GitLab is open source software to collaborate on code.
     %br

changelogs/unreleased/cs-fix-commercial-content-check.yml

+---
+title: Fix version information not showing on help page if commercial content display
+  was disabled.
+merge_request: 16743
+author: 
+type: fixed