diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-04-29 15:02:24 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-04-29 15:02:24 +0000 |
| commit | 43c7dae9aa3b59252fe78bdf81ef011ff874aef2 (patch) | |
| tree | 86fceccffa8de2ccc59a213877c1c181211e8f12 | |
| parent | 68942a496c0900a98ff1b993f6e20fd460f017b8 (diff) | |
| parent | 3b86728070732cab4854799b4e954bcd16e07a3c (diff) | |
| download | gitlab-ce-43c7dae9aa3b59252fe78bdf81ef011ff874aef2.tar.gz | |
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
| -rw-r--r-- | app/views/help/index.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/55948-help-text-formatting-wiki.yml | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index 916f98a62d1..75e4dc46c9b 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -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 diff --git a/changelogs/unreleased/55948-help-text-formatting-wiki.yml b/changelogs/unreleased/55948-help-text-formatting-wiki.yml new file mode 100644 index 00000000000..e1e0475a117 --- /dev/null +++ b/changelogs/unreleased/55948-help-text-formatting-wiki.yml @@ -0,0 +1,5 @@ +--- +title: Format extra help page text like wiki +merge_request: 26782 +author: Bastian Blank +type: fixed |