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

use NotificationService for handle notify logic when MR created

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-26 17:16:06 +02:00
parent 58a1ed6dd3
commit 38ffb8220c
4 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/observers/merge_request_observer.rb
View file

@ -2,9 +2,7 @@ class MergeRequestObserver < ActiveRecord::Observer
cattr_accessor :current_user
def after_create(merge_request)
if merge_request.assignee && merge_request.assignee != current_user
Notify.delay.new_merge_request_email(merge_request.id)
end
notification.new_merge_request(merge_request, current_user)
end
def after_close(merge_request, transition)

12
app/services/notification_service.rb
View file

@ -47,7 +47,7 @@ class NotificationService
end
end
# When we reassign an issue we should send next emails:
# When create an issue we should send next emails:
#
# * issue assignee if his notification level is not Disabled
#
@ -56,4 +56,14 @@ class NotificationService
Notify.delay.new_issue_email(issue.id)
end
end
# When create a merge request we should send next emails:
#
# * mr assignee if his notification level is not Disabled
#
def new_merge_request(merge_request, current_user)
if merge_request.assignee && merge_request.assignee != current_user
Notify.delay.new_merge_request_email(merge_request.id)
end
end
end