diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-08 20:49:01 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-08 20:49:01 +0000 |
| commit | 18f5cca25bb6a12e6fffdad427945c081b19ecaf (patch) | |
| tree | 787bc572ef27531631e12cfc2cfd16faad26932c /app/controllers | |
| parent | fe75d163ab7d04419de97b43c0cd95b5929d57cb (diff) | |
| parent | 40b6d9064a2ab6c89cb54b62536fe2952c6cbca6 (diff) | |
| download | gitlab-ce-18f5cca25bb6a12e6fffdad427945c081b19ecaf.tar.gz | |
Merge branch '14098-customize-after-sign-up-path' into 'master'
Allow custom text on 'almost there' page
Add a new application setting, after_sign_up_text. This is text to be
rendered as Markdown and shown on the 'almost there' page after a user
signs up, but before they've confirmed their account.
Closes #14098.
See merge request !4098
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 0a34a12e2a7..f4eda864aac 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -74,6 +74,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :two_factor_grace_period, :gravatar_enabled, :sign_in_text, + :after_sign_up_text, :help_page_text, :home_page_url, :after_sign_out_path, |