ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error in AdminMailer#new_pending_account (#10264)

rebase/4.0.0rc2
Eugen Rochko 2019-03-14 14:20:22 +01:00 committed by GitHub
parent 6841d8fc74
commit 874bd3ac0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/mailers/admin_mailer.rb
View File

@ -15,8 +15,8 @@ class AdminMailer < ApplicationMailer
end end
end end
def new_pending_account(recipient, account) def new_pending_account(recipient, user)
@account = account @account = user.account
@me = recipient @me = recipient
@instance = Rails.configuration.x.local_domain @instance = Rails.configuration.x.local_domain