gyiang
/
gitlab
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only pass abuse report ID to AbuseReportMailer.

This commit is contained in:
Douwe Maan 2015-10-18 11:58:45 +02:00
parent dc170516ed
commit 9f6dc2a4b2
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/abuse_reports_controller.rb
View File

@ -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

10
app/mailers/abuse_report_mailer.rb
View File

@ -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