Port of 55948-help-text-formatting-wiki to EE

74647b0e · Dennis Tang · Annabel Dunstone Gray · edcb6211 · 74647b0e · 74647b0e
Commit 74647b0e authored Apr 29, 2019 by Dennis Tang Committed by Annabel Dunstone Gray Apr 29, 2019
Showing with 7 additions and 1 deletion

app/views/help/index.html.haml app/views/help/index.html.haml +2 -1

changelogs/unreleased/55948-help-text-formatting-wiki.yml changelogs/unreleased/55948-help-text-formatting-wiki.yml +5 -0

No files found.
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
 %div
 - if Gitlab::CurrentSettings.help_page_text.present?
-  = markdown(Gitlab::CurrentSettings.help_page_text)
+  .prepend-top-default.md
+    = markdown_field(Gitlab::CurrentSettings.current_application_settings, :help_page_text)
  %hr
 %h1

--- a/changelogs/unreleased/55948-help-text-formatting-wiki.yml
+++ b/changelogs/unreleased/55948-help-text-formatting-wiki.yml
+---
+title: Format extra help page text like wiki
+merge_request: 26782
+author: Bastian Blank
+type: fixed