diff options
| author | Phil Hughes <me@iamphill.com> | 2017-09-28 16:06:00 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-09-28 16:06:00 +0000 |
| commit | 9e3d1f86d5cfa65fbd76489f47196e947b18d883 (patch) | |
| tree | 763f2edd6dab4cf0225d9a1f43dea2c645f79dae | |
| parent | cd5896ed7b8a63b98cd48dd5cb17a8838657d4f0 (diff) | |
| parent | 714c062b387e4b1bb9c639df9467b53c6fbc0c1f (diff) | |
| download | gitlab-ce-9e3d1f86d5cfa65fbd76489f47196e947b18d883.tar.gz | |
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
| -rw-r--r-- | app/views/devise/mailer/confirmation_instructions.html.haml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/13637-show-account-confirmation-link-in-e-mail-text.yml | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/views/devise/mailer/confirmation_instructions.html.haml b/app/views/devise/mailer/confirmation_instructions.html.haml index a508b7537a2..4d1037807be 100644 --- a/app/views/devise/mailer/confirmation_instructions.html.haml +++ b/app/views/devise/mailer/confirmation_instructions.html.haml @@ -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 diff --git a/changelogs/unreleased/13637-show-account-confirmation-link-in-e-mail-text.yml b/changelogs/unreleased/13637-show-account-confirmation-link-in-e-mail-text.yml new file mode 100644 index 00000000000..5f98d0cc766 --- /dev/null +++ b/changelogs/unreleased/13637-show-account-confirmation-link-in-e-mail-text.yml @@ -0,0 +1,5 @@ +--- +title: Confirmation email shows link as text instead of human readable text +merge_request: 14243 +author: bitsapien +type: changed |