diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-09-18 12:24:15 +0300 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-09-18 12:24:15 +0300 |
| commit | 1eb3dde45b55afb723954e577b7bd12946aeb3ca (patch) | |
| tree | d9ad4c068767c22549badee05a06d639330973e6 /app/views | |
| parent | d272682a1534020a9060767e922ddb02ab075c8b (diff) | |
| parent | fe17a236e37c2d7504925a474a716f714f160b2d (diff) | |
Merge branch 'add-custom-text-to-help' into 'master'
Allow custom info to be added to Help page
Fixes #2536
**Admin screen**
**Text on the Help page**
/cc @DouweM
See merge request !1309
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 5 | ||||
| -rw-r--r-- | app/views/help/index.html.haml | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 330b8bbf9d2..a36ae0b766c 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -118,6 +118,11 @@ .col-sm-10 = f.text_area :sign_in_text, class: 'form-control', rows: 4 .help-block Markdown enabled + .form-group + = f.label :help_page_text, class: 'control-label col-sm-2' + .col-sm-10 + = f.text_area :help_page_text, class: 'form-control', rows: 4 + .help-block Markdown enabled .form-actions = f.submit 'Save', class: 'btn btn-primary' 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 |