diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-04-10 09:16:08 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-10 09:16:08 +0200 |
| commit | 5085559b15ef1c1fe3742757d00e5651fc52b5b5 (patch) | |
| tree | 0249b98caced1e39387564f04391eb1a0c39a2d7 /app/views/admin_mailer/new_pending_account.text.erb | |
| parent | cb410f80a40d03b509cec244b0cdd4ed3957c6a0 (diff) | |
| parent | 830c2a9ccbe98e145640e12637ef3da56f41a7b5 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.
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 %> |