Make AbuseReportMailer responsible for knowing if it should deliver

1 files changed, 9 insertions, 1 deletions

diff --git a/app/mailers/abuse_report_mailer.rb b/app/mailers/abuse_report_mailer.rb
index f0c41f69a5c..d0ce827a595 100644
--- a/app/mailers/abuse_report_mailer.rb
+++ b/app/mailers/abuse_report_mailer.rb
@@ -2,11 +2,19 @@ class AbuseReportMailer < BaseMailer
   include Gitlab::CurrentSettings
 
   def notify(abuse_report_id)
+    return unless deliverable?
+
     @abuse_report = AbuseReport.find(abuse_report_id)
 
     mail(
-      to:       current_application_settings.admin_notification_email, 
+      to:       current_application_settings.admin_notification_email,
       subject:  "#{@abuse_report.user.name} (#{@abuse_report.user.username}) was reported for abuse"
     )
   end
+
+  private
+
+  def deliverable?
+    current_application_settings.admin_notification_email.present?
+  end
 end