diff options
| author | ThibG <thib@sitedethib.com> | 2019-04-10 22:33:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-10 22:33:41 +0200 |
| commit | 31e4fcb006c6ef2d8e1a4c765e897afa1cba1b5c (patch) | |
| tree | 15a022b1b44f72fee2d83cfe6f8355b7334f9d9b /app/views/admin_mailer/new_pending_account.text.erb | |
| parent | cb410f80a40d03b509cec244b0cdd4ed3957c6a0 (diff) | |
| parent | 2f422b708f75bea87a49eb879ec3e0c3f35c2f9b (diff) | |
Merge pull request #985 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin_mailer/new_pending_account.text.erb')
| -rw-r--r-- | app/views/admin_mailer/new_pending_account.text.erb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/views/admin_mailer/new_pending_account.text.erb b/app/views/admin_mailer/new_pending_account.text.erb index ed31ae2eb..a466ee2de 100644 --- a/app/views/admin_mailer/new_pending_account.text.erb +++ b/app/views/admin_mailer/new_pending_account.text.erb @@ -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 %> |