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:
authorSean McGivern <sean@gitlab.com>2017-01-17 12:22:44 +0300
committerSean McGivern <sean@gitlab.com>2017-01-17 12:22:44 +0300
commit48e31125f205971835ce02d07563d72aa193db6b (patch)
tree3dc4857587b0cd89128a25e8ec7d1fada700e8e1 /app/mailers
parentf92fd30313fc30f877caccf31562fe015dded126 (diff)
Add text version of unapproval email
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/merge_requests.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb
index 4f94ae20c8d..ee3b2ff5fcc 100644
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -58,7 +58,6 @@ module Emails
setup_merge_request_mail(merge_request_id, recipient_id)
@approved_by = User.find(approved_by_user_id)
- @approved_by_users = @merge_request.approved_by_users.map(&:name)
mail_answer_thread(@merge_request, merge_request_thread_options(approved_by_user_id, recipient_id))
end
@@ -66,7 +65,6 @@ module Emails
setup_merge_request_mail(merge_request_id, recipient_id)
@unapproved_by = User.find(unapproved_by_user_id)
- @unapproved_by_users = @merge_request.approved_by_users.map(&:name)
mail_answer_thread(@merge_request, merge_request_thread_options(approved_by_user_id, recipient_id))
end