diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-05-09 16:12:53 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-06-08 19:08:53 +0100 |
| commit | 40b6d9064a2ab6c89cb54b62536fe2952c6cbca6 (patch) | |
| tree | 118c635941d8e8dd0ea072e402921c2f4da58158 /app/models/application_setting.rb | |
| parent | e6daf1f899b412ded9a16674865b09f31fc7c75a (diff) | |
| download | gitlab-ce-40b6d9064a2ab6c89cb54b62536fe2952c6cbca6.tar.gz | |
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.
Tweak the styles for that page so that centered lists look reasonable.
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 42f908aa344..a744f937918 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -113,7 +113,10 @@ class ApplicationSetting < ActiveRecord::Base signup_enabled: Settings.gitlab['signup_enabled'], signin_enabled: Settings.gitlab['signin_enabled'], gravatar_enabled: Settings.gravatar['enabled'], - sign_in_text: Settings.extra['sign_in_text'], + sign_in_text: nil, + after_sign_up_text: nil, + help_page_text: nil, + shared_runners_text: nil, restricted_visibility_levels: Settings.gitlab['restricted_visibility_levels'], max_attachment_size: Settings.gitlab['max_attachment_size'], session_expire_delay: Settings.gitlab['session_expire_delay'], |