kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '55948-help-text-formatting-wiki' into 'master' 

Format extra help page text like wiki

Closes #55948

See merge request gitlab-org/gitlab-ce!26782
This commit is contained in:
Annabel Dunstone Gray 2019-04-29 15:02:24 +00:00
parent 68942a496c 3b86728070
commit 43c7dae9aa
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/help/index.html.haml
View File

@ -1,6 +1,7 @@
%div
- if Gitlab::CurrentSettings.help_page_text.present?
= markdown_field(Gitlab::CurrentSettings.current_application_settings, :help_page_text)
.prepend-top-default.md
= markdown_field(Gitlab::CurrentSettings.current_application_settings, :help_page_text)
%hr
%h1

5
changelogs/unreleased/55948-help-text-formatting-wiki.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Format extra help page text like wiki
merge_request: 26782
author: Bastian Blank
type: fixed