diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-01 20:01:19 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-01 20:01:19 +0400 |
| commit | f49fb5dca1ecf2b1ae6415920de09b4d95c14bb1 (patch) | |
| tree | 14f6697a198486501ddb632a4bef3e514eb8a148 /app/mailers | |
| parent | ef9298febbe5d84b641fcef4e4c9f8997e17a15a (diff) | |
Fix error when reassign issue/merge_request from non-assigned. Fixes #3201
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/emails/issues.rb | 2 | ||||
| -rw-r--r-- | app/mailers/emails/merge_requests.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb index 79731b60f45..c1112a98f92 100644 --- a/app/mailers/emails/issues.rb +++ b/app/mailers/emails/issues.rb @@ -8,7 +8,7 @@ module Emails def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id) @issue = Issue.find(issue_id) - @previous_assignee ||= User.find(previous_assignee_id) + @previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id @project = @issue.project mail(to: recipient(recipient_id), subject: subject("changed issue ##{@issue.id}", @issue.title)) end diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb index 806f1b01b72..de47903c0d4 100644 --- a/app/mailers/emails/merge_requests.rb +++ b/app/mailers/emails/merge_requests.rb @@ -8,7 +8,7 @@ module Emails def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id) @merge_request = MergeRequest.find(merge_request_id) - @previous_assignee ||= User.find(previous_assignee_id) + @previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id @project = @merge_request.project mail(to: recipient(recipient_id), subject: subject("changed merge request !#{@merge_request.id}", @merge_request.title)) end |