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 29 @project = note.project
30 30 @commit = @project.repo.commits(note.noteable_id).first
31 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 33 end
34 34  
35 35 def note_merge_request_email(user, note)
... ... @@ -37,7 +37,7 @@ class Notify < ActionMailer::Base
37 37 @note = note
38 38 @project = note.project
39 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 41 end
42 42  
43 43 def note_issue_email(user, note)
... ... @@ -45,14 +45,14 @@ class Notify < ActionMailer::Base
45 45 @note = note
46 46 @project = note.project
47 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 49 end
50 50  
51 51 def new_merge_request_email(merge_request)
52 52 @user = merge_request.assignee
53 53 @merge_request = merge_request
54 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 56 end
57 57  
58 58 def changed_merge_request_email(user, merge_request)
... ... @@ -60,7 +60,7 @@ class Notify < ActionMailer::Base
60 60 @assignee_was ||= User.find(merge_request.assignee_id_was)
61 61 @merge_request = merge_request
62 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 64 end
65 65  
66 66 def changed_issue_email(user, issue)
... ... @@ -68,6 +68,6 @@ class Notify < ActionMailer::Base
68 68 @assignee_was ||= User.find(issue.assignee_id_was)
69 69 @issue = issue
70 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 72 end
73 73 end
... ...