summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-18 03:07:23 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-18 03:07:23 +0000
commit962afb3da11a72c7fca322378886b2c0be9f3385 (patch)
tree541e08c4d329ab62cfbadde45b0f15d2171e004e /app/controllers
parent8a560d56661f56804ddf6596f928e7d25db37443 (diff)
downloadgitlab-ce-master.tar.gz
Add latest changes from gitlab-org/gitlab@masterHEADmaster
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/abuse_reports_controller.rb4
-rw-r--r--app/controllers/profiles/preferences_controller.rb1
2 files changed, 3 insertions, 2 deletions
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
diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb
index a5a2cbf3733..f19113276c2 100644
--- a/app/controllers/profiles/preferences_controller.rb
+++ b/app/controllers/profiles/preferences_controller.rb
@@ -54,6 +54,7 @@ class Profiles::PreferencesController < Profiles::ApplicationController
:sourcegraph_enabled,
:gitpod_enabled,
:render_whitespace_in_code,
+ :project_shortcut_buttons,
:markdown_surround_selection,
:markdown_automatic_lists,
:use_new_navigation