diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-08 23:49:01 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-08 23:49:01 +0300 |
| commit | 18f5cca25bb6a12e6fffdad427945c081b19ecaf (patch) | |
| tree | 787bc572ef27531631e12cfc2cfd16faad26932c /app/views/devise | |
| parent | fe75d163ab7d04419de97b43c0cd95b5929d57cb (diff) | |
| parent | 40b6d9064a2ab6c89cb54b62536fe2952c6cbca6 (diff) | |
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/views/devise')
| -rw-r--r-- | app/views/devise/confirmations/almost_there.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/devise/confirmations/almost_there.haml b/app/views/devise/confirmations/almost_there.haml index 3c3830a3f10..73c3a3dd2eb 100644 --- a/app/views/devise/confirmations/almost_there.haml +++ b/app/views/devise/confirmations/almost_there.haml @@ -3,6 +3,9 @@ Almost there... %p.lead Please check your email to confirm your account +- if after_sign_up_text.present? + .well-confirmation.text-center + = markdown(after_sign_up_text) %p.confirmation-content.text-center No confirmation email received? Please check your spam folder or .append-bottom-20.prepend-top-20.text-center |