Skip to content
Snippets Groups Projects
Commit 2d124d94 authored by Robb Kidd's avatar Robb Kidd
Browse files

Add delegate for project's name on Note.

parent 41c00a20
No related branches found
No related tags found
1 merge request!824Spec Notify mailers
Loading
Loading
@@ -24,28 +24,28 @@ class Notify < ActionMailer::Base
def note_wall_email(recipient_id, note_id)
recipient = User.find(recipient_id)
@note = Note.find(note_id)
mail(:to => recipient.email, :subject => "gitlab | #{@note.project.name} ")
mail(:to => recipient.email, :subject => "gitlab | #{@note.project_name} ")
end
 
def note_commit_email(recipient_id, note_id)
recipient = User.find(recipient_id)
@note = Note.find(note_id)
@commit = @note.target
mail(:to => recipient.email, :subject => "gitlab | note for commit | #{@note.project.name} ")
mail(:to => recipient.email, :subject => "gitlab | note for commit | #{@note.project_name} ")
end
 
def note_merge_request_email(recipient_id, note_id)
recipient = User.find(recipient_id)
@note = Note.find(note_id)
@merge_request = @note.noteable
mail(:to => recipient.email, :subject => "gitlab | note for merge request | #{@note.project.name} ")
mail(:to => recipient.email, :subject => "gitlab | note for merge request | #{@note.project_name} ")
end
 
def note_issue_email(recipient_id, note_id)
recipient = User.find(recipient_id)
@note = Note.find(note_id)
@issue = @note.noteable
mail(:to => recipient.email, :subject => "gitlab | note for issue #{@issue.id} | #{@note.project.name} ")
mail(:to => recipient.email, :subject => "gitlab | note for issue #{@issue.id} | #{@note.project_name} ")
end
 
def new_merge_request_email(merge_request)
Loading
Loading
Loading
Loading
@@ -7,6 +7,10 @@ class Note < ActiveRecord::Base
belongs_to :author,
:class_name => "User"
 
delegate :name,
:to => :project,
:prefix => true
delegate :name,
:email,
:to => :author,
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment