Commit db582b63 authored by Valery Sizov's avatar Valery Sizov

Notification when created merge request

parent 7713f7fe
...@@ -38,4 +38,11 @@ class Notify < ActionMailer::Base ...@@ -38,4 +38,11 @@ class Notify < ActionMailer::Base
@issue = note.noteable @issue = note.noteable
mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ") mail(:to => @user.email, :subject => "gitlab | #{@note.project.name} ")
end 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} ")
end
end end
class MailerObserver < ActiveRecord::Observer class MailerObserver < ActiveRecord::Observer
observe :issue, :user, :note, :snippet observe :issue, :user, :note, :merge_request
cattr_accessor :current_user cattr_accessor :current_user
def after_create(model) def after_create(model)
new_issue(model) if model.kind_of?(Issue) new_issue(model) if model.kind_of?(Issue)
new_user(model) if model.kind_of?(User) new_user(model) if model.kind_of?(User)
new_note(model) if model.kind_of?(Note) new_note(model) if model.kind_of?(Note)
new_merge_request(model) if model.kind_of?(MergeRequest)
end end
protected protected
...@@ -38,4 +39,10 @@ class MailerObserver < ActiveRecord::Observer ...@@ -38,4 +39,10 @@ class MailerObserver < ActiveRecord::Observer
end end
end end
def new_merge_request(merge_request)
if merge_request.assignee != current_user
Notify.new_merge_request_email(merge_request).deliver
end
end
end end
%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 Merge Request
= link_to truncate(@merge_request.title, :length => 16), project_merge_request_url(@project, @merge_request)
%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; "}
Branches: #{@merge_request.source_branch} &rarr; #{@merge_request.target_branch}
%p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
Asignee: #{@merge_request.author.name} &rarr; #{@merge_request.assignee.name}
%td
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment