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

Fix missing @project errors

Browse source
This commit is contained in:
Riyad Preukschas 2012-08-06 03:16:06 +02:00
parent 6f9428b1cd
commit 9a0b763eec
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/mailers/notify.rb
View file

@ -16,12 +16,14 @@ class Notify < ActionMailer::Base
def new_issue_email(issue_id)
@issue = Issue.find(issue_id)
@project = @issue.project
mail(:to => @issue.assignee_email, :subject => "gitlab | New Issue was created")
end
def note_wall_email(recipient_id, note_id)
recipient = User.find(recipient_id)
@note = Note.find(note_id)
@project = @note.project
mail(:to => recipient.email, :subject => "gitlab | #{@note.project_name} ")
end
@ -29,6 +31,7 @@ class Notify < ActionMailer::Base
recipient = User.find(recipient_id)
@note = Note.find(note_id)
@commit = @note.target
@project = @note.project
mail(:to => recipient.email, :subject => "gitlab | note for commit | #{@note.project_name} ")
end
@ -36,6 +39,7 @@ class Notify < ActionMailer::Base
recipient = User.find(recipient_id)
@note = Note.find(note_id)
@merge_request = @note.noteable
@project = @note.project
mail(:to => recipient.email, :subject => "gitlab | note for merge request | #{@note.project_name} ")
end
@ -43,6 +47,7 @@ class Notify < ActionMailer::Base
recipient = User.find(recipient_id)
@note = Note.find(note_id)
@issue = @note.noteable
@project = @note.project
mail(:to => recipient.email, :subject => "gitlab | note for issue #{@issue.id} | #{@note.project_name} ")
end
@ -50,11 +55,13 @@ class Notify < ActionMailer::Base
recipient = User.find(recipient_id)
@note = Note.find(note_id)
@wiki = @note.noteable
@project = @note.project
mail(:to => recipient.email, :subject => "gitlab | note for wiki | #{@note.project_name}")
end
def new_merge_request_email(merge_request_id)
@merge_request = MergeRequest.find(merge_request_id)
@project = @merge_request.project
mail(:to => @merge_request.assignee_email, :subject => "gitlab | new merge request | #{@merge_request.title} ")
end
@ -62,6 +69,7 @@ class Notify < ActionMailer::Base
recipient = User.find(recipient_id)
@merge_request = MergeRequest.find(merge_request_id)
@previous_assignee ||= User.find(previous_assignee_id)
@project = @merge_request.project
mail(:to => recipient.email, :subject => "gitlab | merge request changed | #{@merge_request.title} ")
end
@ -69,6 +77,7 @@ class Notify < ActionMailer::Base
recipient = User.find(recipient_id)
@issue = Issue.find(issue_id)
@previous_assignee ||= User.find(previous_assignee_id)
@project = @issue.project
mail(:to => recipient.email, :subject => "gitlab | changed issue | #{@issue.title} ")
end
end