Changed account confirmation line to e-mail text. This MR fixes issue #13637
added changelog
This commit is contained in:
parent
76b2a12700
commit
714c062b38
|
@ -1,9 +1,10 @@
|
|||
- 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
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Confirmation email shows link as text instead of human readable text
|
||||
merge_request: 14243
|
||||
author: bitsapien
|
||||
type: changed
|
Loading…
Reference in New Issue