diff options
| author | bitsapien <bitsapien@gmail.com> | 2017-09-13 09:52:03 +0530 |
|---|---|---|
| committer | bitsapien <bitsapien@gmail.com> | 2017-09-28 05:46:36 +0530 |
| commit | 714c062b387e4b1bb9c639df9467b53c6fbc0c1f (patch) | |
| tree | c6c5826d5c907da69fe0274fcd1fd438168ed6c5 | |
| parent | 76b2a12700f411ff5fef80c06a34d129650b672a (diff) | |
| download | gitlab-ce-714c062b387e4b1bb9c639df9467b53c6fbc0c1f.tar.gz | |
Changed account confirmation line to e-mail text. This MR fixes issue #13637
added changelog
| -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 |