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

Merge branch 'cs-fix-commercial-content-check' into 'master'
208ac01a · Robert Speicher · 6c978c8f · 948311f7 · 208ac01a · 208ac01a
Commit 208ac01a authored Jan 26, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 8 deletions

index.html.haml app/views/help/index.html.haml +9 -8

cs-fix-commercial-content-check.yml changelogs/unreleased/cs-fix-commercial-content-check.yml +6 -0

No files found.
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -5,15 +5,16 @@
  = markdown_field(current_application_settings, :help_page_text)
  %hr

- unless current_application_settings.help_page_hide_commercial_content?
-  %h1
-    GitLab
-    Community Edition
-    - if user_signed_in?
-      %span= Gitlab::VERSION
-      %small= link_to Gitlab::REVISION, Gitlab::COM_URL + namespace_project_commits_path('gitlab-org', 'gitlab-ce', Gitlab::REVISION)
-      = version_status_badge
+%h1
+  GitLab
+  Community Edition
+  - if user_signed_in?
+    %span= Gitlab::VERSION
+    %small= link_to Gitlab::REVISION, Gitlab::COM_URL + namespace_project_commits_path('gitlab-org', 'gitlab-ce', Gitlab::REVISION)
+    = version_status_badge
+  %hr

+- unless current_application_settings.help_page_hide_commercial_content?
  %p.slead
    GitLab is open source software to collaborate on code.
    %br

--- a/changelogs/unreleased/cs-fix-commercial-content-check.yml
+++ b/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