diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-13 12:10:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-13 12:10:19 +0000 |
| commit | 0cb47d7129c3d5d7bc91d32222ca70d46cb976ca (patch) | |
| tree | 62948ad6c745fed967308818398aefdf798e0e29 /app/models/user_preference.rb | |
| parent | 0b679004a6d0f375dfa0e5bcbdc2b4890b4c6102 (diff) | |
| download | gitlab-ce-0cb47d7129c3d5d7bc91d32222ca70d46cb976ca.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.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb index 7687430cfd1..9b4c0a2527a 100644 --- a/app/models/user_preference.rb +++ b/app/models/user_preference.rb @@ -19,6 +19,9 @@ class UserPreference < ApplicationRecord greater_than_or_equal_to: Gitlab::TabWidth::MIN, less_than_or_equal_to: Gitlab::TabWidth::MAX } + validates :diffs_deletion_color, :diffs_addition_color, + format: { with: ColorsHelper::HEX_COLOR_PATTERN }, + allow_blank: true ignore_columns :experience_level, remove_with: '14.10', remove_after: '2021-03-22' |