Skip to content

Commit 1666b19

Browse files
authored
Fix confirmation e-mails when signing up through an app (mastodon#29064)
1 parent 3c315a6 commit 1666b19

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

app/views/user_mailer/confirmation_instructions.html.haml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
%td.email-inner-card-td.email-prose
99
%p= t @resource.approved? ? 'devise.mailer.confirmation_instructions.explanation' : 'devise.mailer.confirmation_instructions.explanation_when_pending', host: site_hostname
1010
- if @resource.created_by_application
11-
= render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
12-
= link_to confirmation_url(@resource, confirmation_token: @token, redirect_to_app: 'true') do
13-
%span= t 'devise.mailer.confirmation_instructions.action_with_app', app: @resource.created_by_application.name
11+
= render 'application/mailer/button', text: t('devise.mailer.confirmation_instructions.action_with_app', app: @resource.created_by_application.name), url: confirmation_url(@resource, confirmation_token: @token, redirect_to_app: 'true')
1412
- else
1513
= render 'application/mailer/button', text: t('devise.mailer.confirmation_instructions.action'), url: confirmation_url(@resource, confirmation_token: @token)
1614
%p= t 'devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: privacy_policy_url

0 commit comments

Comments
 (0)