diff options
| author | Jonathan Rochkind <jonathan@dnil.net> | 2015-10-08 11:13:28 -0400 |
|---|---|---|
| committer | Jonathan Rochkind <jonathan@dnil.net> | 2015-10-08 17:33:57 -0400 |
| commit | ae4fbae26cefbf10848719ee8c06d418c348420c (patch) | |
| tree | 147370c32c20f1c78b0e078e442b4c7ba5bf1001 /app/controllers | |
| parent | 0de7c83a78711601b40b5a739070da2e3af29b11 (diff) | |
| download | gitlab-ce-ae4fbae26cefbf10848719ee8c06d418c348420c.tar.gz | |
Send an email (to support) when a user is reported for spam
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/abuse_reports_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/abuse_reports_controller.rb b/app/controllers/abuse_reports_controller.rb index 65dbd5ef551..482ec5054ac 100644 --- a/app/controllers/abuse_reports_controller.rb +++ b/app/controllers/abuse_reports_controller.rb @@ -11,6 +11,9 @@ class AbuseReportsController < ApplicationController 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) + end else render :new end diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 5f70582cbb7..18a258c139f 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -55,6 +55,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :default_snippet_visibility, :restricted_signup_domains_raw, :version_check_enabled, + :admin_notification_email, :user_oauth_applications, :ci_enabled, restricted_visibility_levels: [], |