Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cafeab0c
Commit
cafeab0c
authored
Jan 26, 2018
by
Connor Shea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Port of cs-fix-commercial-content-check to EE.
parent
3e3f09cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
9 deletions
+15
-9
app/views/help/index.html.haml
app/views/help/index.html.haml
+9
-9
changelogs/unreleased/cs-fix-commercial-content-check.yml
changelogs/unreleased/cs-fix-commercial-content-check.yml
+6
-0
No files found.
app/views/help/index.html.haml
View file @
cafeab0c
...
...
@@ -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
0 → 100644
View file @
cafeab0c
---
title
:
Fix version information not showing on help page if commercial content display
was disabled.
merge_request
:
16743
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment