summaryrefslogtreecommitdiff
path: root/app/models/user_preference.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-11 12:12:30 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-11 12:12:30 +0000
commit0b54f87a31c23544ca5917bf772ce9c64a61562c (patch)
tree79d56df6750e84fd4a10205d9dcce293f7c5d491 /app/models/user_preference.rb
parente348fb4c1b9eaf21655001dc4346ceb0c0c3d5b4 (diff)
downloadgitlab-ce-0b54f87a31c23544ca5917bf772ce9c64a61562c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/user_preference.rb')
-rw-r--r--app/models/user_preference.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 3a1fce9c0b4..9c40376bb13 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -20,8 +20,8 @@ class UserPreference < ApplicationRecord
less_than_or_equal_to: Gitlab::TabWidth::MAX
}
validates :diffs_deletion_color, :diffs_addition_color,
- format: { with: ColorsHelper::HEX_COLOR_PATTERN },
- allow_blank: true
+ format: { with: ColorsHelper::HEX_COLOR_PATTERN },
+ allow_blank: true
validates :pass_user_identities_to_ci_jwt, allow_nil: false, inclusion: { in: [true, false] }