refactored the account confirmation into a partial. Also made the

text in the `.text` version consistent with the `.html` version

app/views/devise/mailer/_confirmation_instructions_account.html.haml

@@ -0,0 +1,15 @@
+- if @resource.unconfirmed_email.present?
+  #content
+    = email_default_heading(@resource.unconfirmed_email)
+    %p Click the link below to confirm your email address.
+  #cta
+    = link_to 'Confirm your email address', confirmation_url(@resource, confirmation_token: @token)
+- else
+  #content
+    - if Gitlab.com?
+      = email_default_heading('Thanks for signing up to GitLab!')
+    - else
+      = email_default_heading("Welcome, #{@resource.name}!")
+    %p To get started, click the link below to confirm your account.
+  #cta
+    = link_to 'Confirm your account', confirmation_url(@resource, confirmation_token: @token)

app/views/devise/mailer/_confirmation_instructions_account.text.erb

@@ -0,0 +1,14 @@
+<% if @resource.unconfirmed_email.present? %>
+<%= @resource.unconfirmed_email %>,
+
+Use the link below to confirm your email address.
+<% else %>
+  <% if Gitlab.com? %>
+Thanks for signing up to GitLab!
+  <% else %>
+Welcome, <%= @resource.name %>!
+  <% end %>
+To get started, use the link below to confirm your account.
+<% end %>  
+
+<%= confirmation_url(@resource, confirmation_token: @token) %>

app/views/devise/mailer/_confirmation_instructions_secondary.html.haml

@@ -1,5 +1,5 @@
 #content
-  = email_default_heading("#{@resource.user.name}, you've added a secondary email!")
+  = email_default_heading("#{@resource.user.name}, you've added an additional email!")
   %p Click the link below to confirm your email address (#{@resource.email})
 #cta
   = link_to 'Confirm your email address', confirmation_url(@resource, confirmation_token: @token)

app/views/devise/mailer/_confirmation_instructions_secondary.text.erb

@@ -1,6 +1,6 @@
-<%= @resource.user.name %>, you've added a secondary email!
+<%= @resource.user.name %>, you've added an additional email!
 
-You can confirm your email (<%= @resource.email %>) through the link below:
+Use the link below to confirm your email address (<%= @resource.email %>)
 
 <%= confirmation_url(@resource, confirmation_token: @token) %>
 

app/views/devise/mailer/confirmation_instructions.html.haml

@@ -1,18 +1,4 @@
-- if @resource.is_a?(Email)
+- if @resource.is_a?(User)
+  = render partial: 'confirmation_instructions_account'
+- else
   = render partial: 'confirmation_instructions_secondary'
-- else
-  - if @resource.unconfirmed_email.present?
-    #content
-      = email_default_heading(@resource.unconfirmed_email)
-      %p Click the link below to confirm your email address.
-    #cta
-      = link_to 'Confirm your email address', confirmation_url(@resource, confirmation_token: @token)
-  - else
-    #content
-      - if Gitlab.com?
-        = email_default_heading('Thanks for signing up to GitLab!')
-      - else
-        = email_default_heading("Welcome, #{@resource.name}!")
-      %p To get started, click the link below to confirm your account.
-    #cta
-      = link_to 'Confirm your account', confirmation_url(@resource, confirmation_token: @token)

app/views/devise/mailer/confirmation_instructions.text.erb

@@ -1,13 +1,5 @@
-<% if @resource.is_a?(Email) %>
+<% if @resource.is_a?(User) %>
+<%= render partial: 'confirmation_instructions_account' %>
+<% else %>
 <%= render partial: 'confirmation_instructions_secondary' %>
-<% else %>
-Welcome, <%= @resource.name %>!
-
-<% if @resource.unconfirmed_email.present? %>
-You can confirm your email (<%= @resource.unconfirmed_email %>) through the link below:
-<% else %>
-You can confirm your account through the link below:
-<% end %>
-
-<%= confirmation_url(@resource, confirmation_token: @token) %>
 <% end %>