From 2f585840dbf4910d3a4b40c1771ff1dd4525625d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 28 Mar 2013 12:52:44 +0200
Subject: [PATCH] Fixed new mr/issue emails

---
 app/mailers/emails/issues.rb               | 4 ++--
 app/mailers/emails/merge_requests.rb       | 4 ++--
 app/views/notify/new_issue_email.html.haml | 6 +++++-
 app/views/notify/new_issue_email.text.erb  | 5 +++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb
index 74114ffd..79731b60 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 76a0ae55..806f1b01 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)
diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml
index 0c891748..f11c8506 100644
--- a/app/views/notify/new_issue_email.html.haml
+++ b/app/views/notify/new_issue_email.html.haml
@@ -1,5 +1,9 @@
 %p
-  New Issue was created and assigned to you.
+  New Issue was created.
 %p
   = "Issue ##{@issue.id}"
   = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
+%p
+  Author: #{@issue.author_name}
+%p
+  Assignee: #{@issue.assignee_name}
diff --git a/app/views/notify/new_issue_email.text.erb b/app/views/notify/new_issue_email.text.erb
index 5ed55c35..9907ca83 100644
--- a/app/views/notify/new_issue_email.text.erb
+++ b/app/views/notify/new_issue_email.text.erb
@@ -1,4 +1,5 @@
-New Issue was created and assigned to you.
+New Issue was created.
           
-
 Issue <%= @issue.id %>: <%= url_for(project_issue_url(@issue.project, @issue)) %>
+Author:   <%= @issue.author_name %>
+Asignee:  <%= @issue.assignee_name %>