Note on merge request open/close
This commit is contained in:
parent
e29b7d52fc
commit
8d7aaf0e55
|
@ -16,66 +16,73 @@ class MailerObserver < ActiveRecord::Observer
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
def new_issue(issue)
|
def new_issue(issue)
|
||||||
if issue.assignee != current_user
|
if issue.assignee != current_user
|
||||||
Notify.new_issue_email(issue).deliver
|
Notify.new_issue_email(issue).deliver
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def new_user(user)
|
||||||
|
Notify.new_user_email(user, user.password).deliver
|
||||||
|
end
|
||||||
|
|
||||||
|
def new_note(note)
|
||||||
|
return unless note.notify or note.notify_author
|
||||||
|
note.project.users.reject { |u| u.id == current_user.id } .each do |u|
|
||||||
|
case note.noteable_type
|
||||||
|
when "Commit" then
|
||||||
|
Notify.note_commit_email(u, note).deliver
|
||||||
|
when "Issue" then
|
||||||
|
Notify.note_issue_email(u, note).deliver
|
||||||
|
when "MergeRequest" then
|
||||||
|
Notify.note_merge_request_email(u, note).deliver
|
||||||
|
when "Snippet"
|
||||||
|
true
|
||||||
|
else
|
||||||
|
Notify.note_wall_email(u, note).deliver
|
||||||
|
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
|
||||||
|
|
||||||
|
def changed_merge_request(merge_request)
|
||||||
|
if merge_request.assignee_id_changed?
|
||||||
|
recipients_ids = merge_request.assignee_id_was, merge_request.assignee_id
|
||||||
|
recipients_ids.delete current_user.id
|
||||||
|
|
||||||
|
User.find(recipients_ids).each do |user|
|
||||||
|
Notify.changed_merge_request_email(user, merge_request).deliver
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def new_user(user)
|
if merge_request.closed_changed?
|
||||||
Notify.new_user_email(user, user.password).deliver
|
note = Note.new(:noteable => merge_request, :project => merge_request.project)
|
||||||
|
note.author = current_user
|
||||||
|
note.note = "_Status changed to #{merge_request.closed ? 'closed' : 'reopened'}_"
|
||||||
|
note.save()
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def new_note(note)
|
def changed_issue(issue)
|
||||||
return unless note.notify or note.notify_author
|
if issue.assignee_id_changed?
|
||||||
note.project.users.reject { |u| u.id == current_user.id } .each do |u|
|
recipients_ids = issue.assignee_id_was, issue.assignee_id
|
||||||
case note.noteable_type
|
recipients_ids.delete current_user.id
|
||||||
when "Commit" then
|
|
||||||
Notify.note_commit_email(u, note).deliver
|
User.find(recipients_ids).each do |user|
|
||||||
when "Issue" then
|
Notify.changed_issue_email(user, issue).deliver
|
||||||
Notify.note_issue_email(u, note).deliver
|
|
||||||
when "MergeRequest" then
|
|
||||||
Notify.note_merge_request_email(u, note).deliver
|
|
||||||
when "Snippet"
|
|
||||||
true
|
|
||||||
else
|
|
||||||
Notify.note_wall_email(u, note).deliver
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def new_merge_request(merge_request)
|
if issue.closed_changed?
|
||||||
if merge_request.assignee != current_user
|
note = Note.new(:noteable => issue, :project => issue.project)
|
||||||
Notify.new_merge_request_email(merge_request).deliver
|
note.author = current_user
|
||||||
end
|
note.note = "_Status changed to #{issue.closed ? 'closed' : 'reopened'}_"
|
||||||
|
note.save()
|
||||||
end
|
end
|
||||||
|
|
||||||
def changed_merge_request(merge_request)
|
|
||||||
if merge_request.assignee_id_changed?
|
|
||||||
recipients_ids = merge_request.assignee_id_was, merge_request.assignee_id
|
|
||||||
recipients_ids.delete current_user.id
|
|
||||||
|
|
||||||
User.find(recipients_ids).each do |user|
|
|
||||||
Notify.changed_merge_request_email(user, merge_request).deliver
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def changed_issue(issue)
|
|
||||||
if issue.assignee_id_changed?
|
|
||||||
recipients_ids = issue.assignee_id_was, issue.assignee_id
|
|
||||||
recipients_ids.delete current_user.id
|
|
||||||
|
|
||||||
User.find(recipients_ids).each do |user|
|
|
||||||
Notify.changed_issue_email(user, issue).deliver
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
if issue.closed_changed?
|
|
||||||
note = Note.new(:noteable => issue, :project => issue.project)
|
|
||||||
note.author = current_user
|
|
||||||
note.note = "_Status changed to #{issue.closed ? 'closed' : 'reopened'}_"
|
|
||||||
note.save()
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue