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

notification for note for merge request

Browse source
This commit is contained in:
Valery Sizov 2011-12-18 16:29:58 +02:00
parent a66d9b4c76
commit 6a0defc3ca
3 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/mailers/notify.rb
View file

@ -31,6 +31,14 @@ class Notify < ActionMailer::Base
mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ") mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ")
end end
def note_merge_request_email(user, note)
@user = user
@note = note
@project = note.project
@merge_request = note.noteable
mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ")
end
def note_issue_email(user, note) def note_issue_email(user, note)
@user = user @user = user
@note = note @note = note

4
app/models/mailer_observer.rb
View file

@ -34,8 +34,8 @@ class MailerObserver < ActiveRecord::Observer
Notify.note_commit_email(u, note).deliver Notify.note_commit_email(u, note).deliver
when "Issue" then when "Issue" then
Notify.note_issue_email(u, note).deliver Notify.note_issue_email(u, note).deliver
when "MergeRequest" when "MergeRequest" then
true # someone should write email notification Notify.note_merge_request_email(u, note).deliver
when "Snippet" when "Snippet"
true true
else else

23
app/views/notify/note_merge_request_email.html.haml Normal file
View file

@ -0,0 +1,23 @@
%td.content{:align => "left", :style => "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", :valign => "top", :width => "600"}
%table{:border => "0", :cellpadding => "0", :cellspacing => "0", :style => "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", :width => "600"}
%tr
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%td{:align => "left", :style => "padding: 20px 0 0;"}
%h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
New comment for Merge Request
= link_to truncate(@merge_request.title, :length => 16), project_merge_request_url(@project, @merge_request, :anchor => "note_#{@note.id}")
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%tr
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%td{:style => "padding: 15px 0 15px;", :valign => "top"}
%p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
%a{:href => "#", :style => "color: #0eb6ce; text-decoration: none;"} #{@note.author.name}
left next message:
%br
%table{:border => "0", :cellpadding => "0", :cellspacing => "0", :width => "558"}
%tr
%td{:valign => "top"}
%cite{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
= @note.note
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}