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

Add invite request to pending account notification e-mail (#10528)

Browse Source 
Fix sorting of the pending accounts page
This commit is contained in:
Eugen Rochko
2019-04-10 00:36:01 +02:00
committed by GitHub
parent 36b39fbac5
commit 46cb36fd2c
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/admin_mailer/new_pending_account.text.erb
View File

@ -2,7 +2,11 @@
<%= raw t('admin_mailer.new_pending_account.body') %>
<%= raw t('admin.accounts.email') %>: <%= @account.user_email %>
<%= raw t('admin.accounts.most_recent_ip') %>: <%= @account.user_current_sign_in_ip %>
<%= @account.user_email %> (@<%= @account.username %>)
<%= @account.user_current_sign_in_ip %>
<% if @account.user&.invite_request&.text.present? %>
<%= raw t('application_mailer.view')%> <%= admin_account_url(@account.id) %>
<%= quote_wrap(@account.user&.invite_request&.text) %>
<% end %>
<%= raw t('application_mailer.view')%> <%= admin_pending_accounts_url %>