Download as
Browse Code »

Commit 09caa7c8add0223dcfa45d7602870d602dffc524

Authored by Valery Sizov
1 parent dae9cd2a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

More descriptive subject in notification message

Showing 1 changed file with 6 additions and 6 deletions   Show diff stats
app/mailers/notify.rb
  Diff comments   View file @09caa7c
@@ -29,7 +29,7 @@ class Notify < ActionMailer::Base @@ -29,7 +29,7 @@ class Notify < ActionMailer::Base
29 @project = note.project 29 @project = note.project
30 @commit = @project.repo.commits(note.noteable_id).first 30 @commit = @project.repo.commits(note.noteable_id).first
31 return unless ( note.notify or ( note.notify_author and @commit.author.email == @user.email ) ) 31 return unless ( note.notify or ( note.notify_author and @commit.author.email == @user.email ) )
32 - mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ") 32 + mail(:to => @user.email, :subject => "gitlab | note for commit | #{@note.project.name} ")
33 end 33 end
34 34
35 def note_merge_request_email(user, note) 35 def note_merge_request_email(user, note)
@@ -37,7 +37,7 @@ class Notify < ActionMailer::Base @@ -37,7 +37,7 @@ class Notify < ActionMailer::Base
37 @note = note 37 @note = note
38 @project = note.project 38 @project = note.project
39 @merge_request = note.noteable 39 @merge_request = note.noteable
40 - mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ") 40 + mail(:to => @user.email, :subject => "gitlab | note for merge request | #{@note.project.name} ")
41 end 41 end
42 42
43 def note_issue_email(user, note) 43 def note_issue_email(user, note)
@@ -45,14 +45,14 @@ class Notify < ActionMailer::Base @@ -45,14 +45,14 @@ class Notify < ActionMailer::Base
45 @note = note 45 @note = note
46 @project = note.project 46 @project = note.project
47 @issue = note.noteable 47 @issue = note.noteable
48 - mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ") 48 + mail(:to => @user.email, :subject => "gitlab | note for issue #{@issue.id} | #{@note.project.name} ")
49 end 49 end
50 50
51 def new_merge_request_email(merge_request) 51 def new_merge_request_email(merge_request)
52 @user = merge_request.assignee 52 @user = merge_request.assignee
53 @merge_request = merge_request 53 @merge_request = merge_request
54 @project = merge_request.project 54 @project = merge_request.project
55 - mail(:to => @user.email, :subject => "gitlab | #{@merge_request.title} ") 55 + mail(:to => @user.email, :subject => "gitlab | new merge request | #{@merge_request.title} ")
56 end 56 end
57 57
58 def changed_merge_request_email(user, merge_request) 58 def changed_merge_request_email(user, merge_request)
@@ -60,7 +60,7 @@ class Notify < ActionMailer::Base @@ -60,7 +60,7 @@ class Notify < ActionMailer::Base
60 @assignee_was ||= User.find(merge_request.assignee_id_was) 60 @assignee_was ||= User.find(merge_request.assignee_id_was)
61 @merge_request = merge_request 61 @merge_request = merge_request
62 @project = merge_request.project 62 @project = merge_request.project
63 - mail(:to => @user.email, :subject => "gitlab | #{@merge_request.title} ") 63 + mail(:to => @user.email, :subject => "gitlab | merge request changed | #{@merge_request.title} ")
64 end 64 end
65 65
66 def changed_issue_email(user, issue) 66 def changed_issue_email(user, issue)
@@ -68,6 +68,6 @@ class Notify < ActionMailer::Base @@ -68,6 +68,6 @@ class Notify < ActionMailer::Base
68 @assignee_was ||= User.find(issue.assignee_id_was) 68 @assignee_was ||= User.find(issue.assignee_id_was)
69 @issue = issue 69 @issue = issue
70 @project = issue.project 70 @project = issue.project
71 - mail(:to => @user.email, :subject => "gitlab | #{@issue.title} ") 71 + mail(:to => @user.email, :subject => "gitlab | changed issue | #{@issue.title} ")
72 end 72 end
73 end 73 end