summaryrefslogtreecommitdiff
path: root/app/models/user.rb
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/models/user.rb
parent8a560d56661f56804ddf6596f928e7d25db37443 (diff)
downloadgitlab-ce-962afb3da11a72c7fca322378886b2c0be9f3385.tar.gz
Add latest changes from gitlab-org/gitlab@masterHEADmaster
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 0c8ff873ba6..8075affdf03 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -361,6 +361,7 @@ class User < ApplicationRecord
:sourcegraph_enabled, :sourcegraph_enabled=,
:gitpod_enabled, :gitpod_enabled=,
:setup_for_company, :setup_for_company=,
+ :project_shortcut_buttons, :project_shortcut_buttons=,
:render_whitespace_in_code, :render_whitespace_in_code=,
:markdown_surround_selection, :markdown_surround_selection=,
:markdown_automatic_lists, :markdown_automatic_lists=,