From 9f6dc2a4b2e5eca01f5712bd7ec4d007ad4e57e5 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Sun, 18 Oct 2015 11:58:45 +0200
Subject: [PATCH] Only pass abuse report ID to AbuseReportMailer.

---
 app/controllers/abuse_reports_controller.rb |  7 ++++---
 app/mailers/abuse_report_mailer.rb          | 10 +++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/controllers/abuse_reports_controller.rb b/app/controllers/abuse_reports_controller.rb
index 482ec5054..2f4054eaa 100644
--- a/app/controllers/abuse_reports_controller.rb
+++ b/app/controllers/abuse_reports_controller.rb
@@ -9,11 +9,12 @@ class AbuseReportsController < ApplicationController
     @abuse_report.reporter = current_user
 
     if @abuse_report.save
+      if current_application_settings.admin_notification_email.present?
+        AbuseReportMailer.delay.notify(@abuse_report.id)
+      end
+
       message = "Thank you for your report. A GitLab administrator will look into it shortly."
       redirect_to root_path, notice: message
-      if current_application_settings.admin_notification_email.present?
-        AbuseReportMailer.delay.notify(@abuse_report, current_application_settings.admin_notification_email)
-      end
     else
       render :new
     end
diff --git a/app/mailers/abuse_report_mailer.rb b/app/mailers/abuse_report_mailer.rb
index c8b9c9c16..f0c41f69a 100644
--- a/app/mailers/abuse_report_mailer.rb
+++ b/app/mailers/abuse_report_mailer.rb
@@ -1,8 +1,12 @@
 class AbuseReportMailer < BaseMailer
+  include Gitlab::CurrentSettings
 
-  def notify(abuse_report, to_email)
-    @abuse_report = abuse_report
+  def notify(abuse_report_id)
+    @abuse_report = AbuseReport.find(abuse_report_id)
 
-    mail(to: to_email, subject: "[Gitlab] Abuse report filed for `#{@abuse_report.user.username}`")
+    mail(
+      to:       current_application_settings.admin_notification_email, 
+      subject:  "#{@abuse_report.user.name} (#{@abuse_report.user.username}) was reported for abuse"
+    )
   end
 end