More descriptive subject in notification message
This commit is contained in:
parent
dae9cd2af6
commit
09caa7c8ad
|
@ -29,7 +29,7 @@ class Notify < ActionMailer::Base
|
|||
@project = note.project
|
||||
@commit = @project.repo.commits(note.noteable_id).first
|
||||
return unless ( note.notify or ( note.notify_author and @commit.author.email == @user.email ) )
|
||||
mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ")
|
||||
mail(:to => @user.email, :subject => "gitlab | note for commit | #{@note.project.name} ")
|
||||
end
|
||||
|
||||
def note_merge_request_email(user, note)
|
||||
|
@ -37,7 +37,7 @@ class Notify < ActionMailer::Base
|
|||
@note = note
|
||||
@project = note.project
|
||||
@merge_request = note.noteable
|
||||
mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ")
|
||||
mail(:to => @user.email, :subject => "gitlab | note for merge request | #{@note.project.name} ")
|
||||
end
|
||||
|
||||
def note_issue_email(user, note)
|
||||
|
@ -45,14 +45,14 @@ class Notify < ActionMailer::Base
|
|||
@note = note
|
||||
@project = note.project
|
||||
@issue = note.noteable
|
||||
mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ")
|
||||
mail(:to => @user.email, :subject => "gitlab | note for issue #{@issue.id} | #{@note.project.name} ")
|
||||
end
|
||||
|
||||
def new_merge_request_email(merge_request)
|
||||
@user = merge_request.assignee
|
||||
@merge_request = merge_request
|
||||
@project = merge_request.project
|
||||
mail(:to => @user.email, :subject => "gitlab | #{@merge_request.title} ")
|
||||
mail(:to => @user.email, :subject => "gitlab | new merge request | #{@merge_request.title} ")
|
||||
end
|
||||
|
||||
def changed_merge_request_email(user, merge_request)
|
||||
|
@ -60,7 +60,7 @@ class Notify < ActionMailer::Base
|
|||
@assignee_was ||= User.find(merge_request.assignee_id_was)
|
||||
@merge_request = merge_request
|
||||
@project = merge_request.project
|
||||
mail(:to => @user.email, :subject => "gitlab | #{@merge_request.title} ")
|
||||
mail(:to => @user.email, :subject => "gitlab | merge request changed | #{@merge_request.title} ")
|
||||
end
|
||||
|
||||
def changed_issue_email(user, issue)
|
||||
|
@ -68,6 +68,6 @@ class Notify < ActionMailer::Base
|
|||
@assignee_was ||= User.find(issue.assignee_id_was)
|
||||
@issue = issue
|
||||
@project = issue.project
|
||||
mail(:to => @user.email, :subject => "gitlab | #{@issue.title} ")
|
||||
mail(:to => @user.email, :subject => "gitlab | changed issue | #{@issue.title} ")
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue