summaryrefslogtreecommitdiff
path: root/app/controllers/abuse_reports_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-10-18 11:58:45 +0200
committerDouwe Maan <douwe@gitlab.com>2015-10-18 11:58:45 +0200
commit9f6dc2a4b2e5eca01f5712bd7ec4d007ad4e57e5 (patch)
tree08eac95f1443b84c57a737fbb0ee76ea221025ac /app/controllers/abuse_reports_controller.rb
parentdc170516edb4760d9dc8843830459fe8066dff42 (diff)
downloadgitlab-ce-9f6dc2a4b2e5eca01f5712bd7ec4d007ad4e57e5.tar.gz
Only pass abuse report ID to AbuseReportMailer.
Diffstat (limited to 'app/controllers/abuse_reports_controller.rb')
-rw-r--r--app/controllers/abuse_reports_controller.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/controllers/abuse_reports_controller.rb b/app/controllers/abuse_reports_controller.rb
index 482ec5054ac..2f4054eaa11 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
- 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)
+ 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
else
render :new
end