diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-01-16 22:39:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-16 22:39:35 +0100 |
commit | a85912b0d6d2ee68aa35794fbb51c5358768c092 (patch) | |
tree | af0dde21359576102ab8dcf8a1dc3342f67bb71c /app/views/admin_mailer | |
parent | 07cb948f39464b11959fc506b673a90d9524e519 (diff) | |
parent | 278bd61d6f507e56350e7f14caaeaa954700ecd8 (diff) |
Merge pull request #1659 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin_mailer')
-rw-r--r-- | app/views/admin_mailer/new_pending_account.text.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin_mailer/new_pending_account.text.erb b/app/views/admin_mailer/new_pending_account.text.erb index bcc251819..a8a2a35fa 100644 --- a/app/views/admin_mailer/new_pending_account.text.erb +++ b/app/views/admin_mailer/new_pending_account.text.erb @@ -3,7 +3,7 @@ <%= raw t('admin_mailer.new_pending_account.body') %> <%= @account.user_email %> (@<%= @account.username %>) -<%= @account.user_current_sign_in_ip %> +<%= @account.user_sign_up_ip %> <% if @account.user&.invite_request&.text.present? %> <%= quote_wrap(@account.user&.invite_request&.text) %> |