diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-09-18 09:24:15 +0000 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-09-18 09:24:15 +0000 |
| commit | 1eb3dde45b55afb723954e577b7bd12946aeb3ca (patch) | |
| tree | d9ad4c068767c22549badee05a06d639330973e6 /app/controllers | |
| parent | d272682a1534020a9060767e922ddb02ab075c8b (diff) | |
| parent | fe17a236e37c2d7504925a474a716f714f160b2d (diff) | |
| download | gitlab-ce-1eb3dde45b55afb723954e577b7bd12946aeb3ca.tar.gz | |
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/controllers')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index f38e07af84b..7c134d2ec9b 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -46,6 +46,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :gravatar_enabled, :twitter_sharing_enabled, :sign_in_text, + :help_page_text, :home_page_url, :after_sign_out_path, :max_attachment_size, |