Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 2 deletions

diff --git a/app/controllers/abuse_reports_controller.rb b/app/controllers/abuse_reports_controller.rb
index 5e613c47fc5..9d1c68eea89 100644
--- a/app/controllers/abuse_reports_controller.rb
+++ b/app/controllers/abuse_reports_controller.rb
@@ -19,7 +19,7 @@ class AbuseReportsController < ApplicationController
       @abuse_report.notify
 
       message = _("Thank you for your report. A GitLab administrator will look into it shortly.")
-      redirect_to @abuse_report.user, notice: message
+      redirect_to root_path, notice: message
     else
       render :new
     end
diff --git a/spec/controllers/abuse_reports_controller_spec.rb b/spec/controllers/abuse_reports_controller_spec.rb
index da7577c371d..bab0d033056 100644
--- a/spec/controllers/abuse_reports_controller_spec.rb
+++ b/spec/controllers/abuse_reports_controller_spec.rb
@@ -59,7 +59,7 @@ RSpec.describe AbuseReportsController do
       it 'redirects back to the reported user' do
         post :create, params: { abuse_report: attrs }
 
-        expect(response).to redirect_to user
+        expect(response).to redirect_to root_path
       end
     end