Merge branch '13637-show-account-confirmation-link-in-e-mail-text' into 'master'

Changed account confirmation line to e-mail text.

Closes #13637

See merge request gitlab-org/gitlab-ce!14243

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

+- confirmation_link = confirmation_url(@resource, confirmation_token: @token)
 - 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)
+    = link_to confirmation_link, confirmation_link
 - else
   #content
     - if Gitlab.com?
@@ -12,4 +13,4 @@
       = 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)
+    = link_to confirmation_link, confirmation_link

changelogs/unreleased/13637-show-account-confirmation-link-in-e-mail-text.yml

+---
+title: Confirmation email shows link as text instead of human readable text
+merge_request: 14243
+author: bitsapien
+type: changed