deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update new_user_email to take id for User and perform find itself.

Browse source
This commit is contained in:
Robb Kidd 2012-05-14 23:07:36 -04:00
parent 06b45acb8f
commit 345f176a74
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/mailers/notify.rb
View file

@ -7,10 +7,10 @@ class Notify < ActionMailer::Base
default from: EMAIL_OPTS["from"]
def new_user_email(user, password)
@user = user
def new_user_email(user_id, password)
@user = User.find(user_id)
@password = password
mail(:to => @user['email'], :subject => "gitlab | Account was created for you")
mail(:to => @user.email, :subject => "gitlab | Account was created for you")
end
def new_issue_email(issue)

2
app/models/mailer_observer.rb
View file

@ -23,7 +23,7 @@ class MailerObserver < ActiveRecord::Observer
end
def new_user(user)
Notify.new_user_email(user, user.password).deliver
Notify.new_user_email(user.id, user.password).deliver
end
def new_note(note)