diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-26 21:44:56 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-26 21:44:56 +0000 |
| commit | 208ac01a47d7c95f7480746b8d9513f53fb1e222 (patch) | |
| tree | b4852d53d86cbd8658926b90d629d7e52bc54f04 | |
| parent | 6c978c8f287d2fc61c58ab59973e0015bfc2ac58 (diff) | |
| parent | 948311f76bc829c91b8e0a15739e34e60588dc8d (diff) | |
| download | gitlab-ce-208ac01a47d7c95f7480746b8d9513f53fb1e222.tar.gz | |
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
| -rw-r--r-- | app/views/help/index.html.haml | 17 | ||||
| -rw-r--r-- | changelogs/unreleased/cs-fix-commercial-content-check.yml | 6 |
2 files changed, 15 insertions, 8 deletions
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index b8692009225..fdd72ead2cb 100644 --- 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 diff --git a/changelogs/unreleased/cs-fix-commercial-content-check.yml b/changelogs/unreleased/cs-fix-commercial-content-check.yml new file mode 100644 index 00000000000..fec80e3ecd2 --- /dev/null +++ b/changelogs/unreleased/cs-fix-commercial-content-check.yml @@ -0,0 +1,6 @@ +--- +title: Fix version information not showing on help page if commercial content display + was disabled. +merge_request: 16743 +author: +type: fixed |