diff options
author | Brett Walker <brett@digitalmoksha.com> | 2017-09-04 19:23:33 +0200 |
---|---|---|
committer | Brett Walker <brett@digitalmoksha.com> | 2017-09-23 15:23:11 +0200 |
commit | f9f467227538df0ce2012df39dfdcf55fb260f94 (patch) | |
tree | 7ebabd8226e6db955d77ca456406197b6a8c0e6b /app/views/devise/mailer/confirmation_instructions.text.erb | |
parent | b14641579855a14398db260ab909ae77c164c883 (diff) | |
download | gitlab-ce-f9f467227538df0ce2012df39dfdcf55fb260f94.tar.gz |
Send a confirmation email when the user adds a secondary email address. Utilizes the Devise `confirmable` capabilities. Issue #37385
Diffstat (limited to 'app/views/devise/mailer/confirmation_instructions.text.erb')
-rw-r--r-- | app/views/devise/mailer/confirmation_instructions.text.erb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/devise/mailer/confirmation_instructions.text.erb b/app/views/devise/mailer/confirmation_instructions.text.erb index 9f76edb76a4..d4bfb3af76f 100644 --- a/app/views/devise/mailer/confirmation_instructions.text.erb +++ b/app/views/devise/mailer/confirmation_instructions.text.erb @@ -1,3 +1,6 @@ +<% if @resource.is_a?(Email) %> +<%= render partial: 'confirmation_instructions_secondary' %> +<% else %> Welcome, <%= @resource.name %>! <% if @resource.unconfirmed_email.present? %> @@ -7,3 +10,4 @@ You can confirm your account through the link below: <% end %> <%= confirmation_url(@resource, confirmation_token: @token) %> +<% end %> |