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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/api/entities.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/current_settings.rb | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 66c138eb902..50d69274b2e 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -351,6 +351,7 @@ module API expose :signin_enabled expose :gravatar_enabled expose :sign_in_text + expose :after_sign_up_text expose :created_at expose :updated_at expose :home_page_url diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 92c7e8b9d88..5e7532f57ae 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -26,7 +26,10 @@ module Gitlab 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'], |