summaryrefslogtreecommitdiff
path: root/app/views/help
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-09-16 13:51:42 +0200
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-09-18 10:15:40 +0200
commitfe17a236e37c2d7504925a474a716f714f160b2d (patch)
tree83950682d2756f8ef76c555ddbcd050a266fca90 /app/views/help
parent0aec0d53b10078613b66b0d41424ee4264ae6406 (diff)
downloadgitlab-ce-fe17a236e37c2d7504925a474a716f714f160b2d.tar.gz
Allow custom info to be added to Help page
Fixes #2536 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Diffstat (limited to 'app/views/help')
-rw-r--r--app/views/help/index.html.haml3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index bf4b7234b21..f492aaf4c0a 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -17,6 +17,9 @@
Used by more than 100,000 organizations, GitLab is the most popular solution to manage git repositories on-premises.
%br
Read more about GitLab at #{link_to promo_host, promo_url, target: '_blank'}.
+ - if current_application_settings.help_page_text.present?
+ %hr
+ = markdown(current_application_settings.help_page_text)
%hr