Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

1 files changed, 15 insertions, 1 deletions

diff --git a/app/controllers/abuse_reports_controller.rb b/app/controllers/abuse_reports_controller.rb
index eec56682300..f6b4fbac8d5 100644
--- a/app/controllers/abuse_reports_controller.rb
+++ b/app/controllers/abuse_reports_controller.rb
@@ -19,6 +19,13 @@ class AbuseReportsController < ApplicationController
       reported_from_url: report_params[:reported_from_url]
     )
 
+    Gitlab::Tracking.event(
+      'ReportAbuse',
+      'select_abuse_category',
+      property: report_params[:category],
+      user: @user
+    )
+
     render :new
   end
 
@@ -29,6 +36,13 @@ class AbuseReportsController < ApplicationController
     if @abuse_report.save
       @abuse_report.notify
 
+      Gitlab::Tracking.event(
+        'ReportAbuse',
+        'submit_form',
+        property: @abuse_report.category,
+        user: @abuse_report.user
+      )
+
       message = _("Thank you for your report. A GitLab administrator will look into it shortly.")
       redirect_to root_path, notice: message
     elsif report_params[:user_id].present?
@@ -41,7 +55,7 @@ class AbuseReportsController < ApplicationController
   private
 
   def report_params
-    params.require(:abuse_report).permit(:message, :user_id, :category, :reported_from_url)
+    params.require(:abuse_report).permit(:message, :user_id, :category, :reported_from_url, links_to_spam: [])
   end
 
   # rubocop: disable CodeReuse/ActiveRecord