From 962afb3da11a72c7fca322378886b2c0be9f3385 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 18 May 2023 03:07:23 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/abuse_reports_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/controllers/abuse_reports_controller.rb') diff --git a/app/controllers/abuse_reports_controller.rb b/app/controllers/abuse_reports_controller.rb index edeac57bc42..55aef945702 100644 --- a/app/controllers/abuse_reports_controller.rb +++ b/app/controllers/abuse_reports_controller.rb @@ -64,8 +64,8 @@ class AbuseReportsController < ApplicationController if @user.nil? redirect_to root_path, alert: _("Cannot create the abuse report. The user has been deleted.") - elsif @user.blocked? - redirect_to @user, alert: _("Cannot create the abuse report. This user has been blocked.") + elsif @user.banned? + redirect_to @user, alert: _("Cannot create the abuse report. This user has been banned.") end end # rubocop: enable CodeReuse/ActiveRecord -- cgit v1.2.1