Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-28 14:52:44 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-28 14:52:44 +0400
commit2f585840dbf4910d3a4b40c1771ff1dd4525625d (patch)
tree67e31a3d795f90514cbdd9588b1de9c0665a9b94 /app/mailers
parentecf3b2e4710276aa1e12a931960bda2aff6ec95c (diff)
Fixed new mr/issue emails
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/issues.rb4
-rw-r--r--app/mailers/emails/merge_requests.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb
index 74114ffd4de..79731b60f45 100644
--- a/app/mailers/emails/issues.rb
+++ b/app/mailers/emails/issues.rb
@@ -1,9 +1,9 @@
module Emails
module Issues
- def new_issue_email(issue_id)
+ def new_issue_email(recipient_id, issue_id)
@issue = Issue.find(issue_id)
@project = @issue.project
- mail(to: @issue.assignee_email, subject: subject("new issue ##{@issue.id}", @issue.title))
+ mail(to: recipient(recipient_id), subject: subject("new issue ##{@issue.id}", @issue.title))
end
def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id)
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb
index 76a0ae55a14..806f1b01b72 100644
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -1,9 +1,9 @@
module Emails
module MergeRequests
- def new_merge_request_email(merge_request_id)
+ def new_merge_request_email(recipient_id, merge_request_id)
@merge_request = MergeRequest.find(merge_request_id)
@project = @merge_request.project
- mail(to: @merge_request.assignee_email, subject: subject("new merge request !#{@merge_request.id}", @merge_request.title))
+ mail(to: recipient(recipient_id), subject: subject("new merge request !#{@merge_request.id}", @merge_request.title))
end
def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id)