tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Admission-based registrations mode (#10250)

Browse Source 
Fix #6856
Fix #6951
This commit is contained in:
Eugen Rochko
2019-03-14 05:28:30 +01:00
committed by GitHub
parent 6e3936aa6f
commit 51e154f5e8
92 changed files with 282 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/user_mailer/confirmation_instructions.html.haml
View File

@ -36,7 +36,7 @@
%tbody
%tr
%td.column-cell.text-center
%p= t 'devise.mailer.confirmation_instructions.explanation', host: site_hostname
%p= t @resource.approved? ? 'devise.mailer.confirmation_instructions.explanation' : 'devise.mailer.confirmation_instructions.explanation_when_pending', host: site_hostname
%table.email-table{ cellspacing: 0, cellpadding: 0 }
%tbody

2
app/views/user_mailer/confirmation_instructions.text.erb
View File

@ -2,7 +2,7 @@
===
<%= t 'devise.mailer.confirmation_instructions.explanation', host: site_hostname %>
<%= t @resource.approved? ? 'devise.mailer.confirmation_instructions.explanation' : 'devise.mailer.confirmation_instructions.explanation_when_pending', host: site_hostname %>
=> <%= confirmation_url(@resource, confirmation_token: @token, redirect_to_app: @resource.created_by_application ? 'true' : nil) %>