diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-14 17:14:05 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-14 17:17:20 +0100 |
| commit | 07eb31eeacc4e0364b839233a41fa65eb3c650ce (patch) | |
| tree | 843cda5a4d9bc730aba9a13d0634fef5e2212515 /app/views/admin_mailer | |
| parent | fa75324059c7a146354470691888dc0e1de0342f (diff) | |
| parent | 874bd3ac0c56e2d2901785e170b27f5cde32b33b (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
Diffstat (limited to 'app/views/admin_mailer')
| -rw-r--r-- | app/views/admin_mailer/new_pending_account.text.erb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/views/admin_mailer/new_pending_account.text.erb b/app/views/admin_mailer/new_pending_account.text.erb new file mode 100644 index 000000000..ed31ae2eb --- /dev/null +++ b/app/views/admin_mailer/new_pending_account.text.erb @@ -0,0 +1,8 @@ +<%= raw t('application_mailer.salutation', name: display_name(@me)) %> + +<%= 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 %> + +<%= raw t('application_mailer.view')%> <%= admin_account_url(@account.id) %> |