diff --git a/app/models/user.rb b/app/models/user.rb index 93c15229e0398a95b706900e64d89ca56b83f236..7fd5d25d7e05df354279e5d61923929963398dea 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -317,9 +317,6 @@ def update_tracked_fields!(request) validates :color_scheme_id, allow_nil: true, inclusion: { in: Gitlab::ColorSchemes.valid_ids, message: ->(*) { _("%{placeholder} is not a valid color scheme") % { placeholder: '%{value}' } } } - validates :hide_no_ssh_key, allow_nil: false, inclusion: { in: [true, false] } - validates :hide_no_password, allow_nil: false, inclusion: { in: [true, false] } - validates :notified_of_own_activity, allow_nil: false, inclusion: { in: [true, false] } after_initialize :set_projects_limit before_validation :sanitize_attrs diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb index 78ccce2aaae253dfeaf8e7c74f4c5fb74edaccff..e527542e35760d9cc713abb322b31e471e4569f1 100644 --- a/app/models/user_preference.rb +++ b/app/models/user_preference.rb @@ -23,8 +23,6 @@ class UserPreference < ApplicationRecord format: { with: ColorsHelper::HEX_COLOR_PATTERN }, allow_blank: true - validates :time_display_relative, allow_nil: false, inclusion: { in: [true, false] } - validates :render_whitespace_in_code, allow_nil: false, inclusion: { in: [true, false] } validates :pass_user_identities_to_ci_jwt, allow_nil: false, inclusion: { in: [true, false] } validates :pinned_nav_items, json_schema: { filename: 'pinned_nav_items' } diff --git a/spec/models/user_preference_spec.rb b/spec/models/user_preference_spec.rb index b2881d309249e6998d9097b555b5aba082f00bd4..729635b5a27f14bb082c489607e873587191b6a6 100644 --- a/spec/models/user_preference_spec.rb +++ b/spec/models/user_preference_spec.rb @@ -8,16 +8,6 @@ let(:user_preference) { create(:user_preference, user: user) } describe 'validations' do - it { is_expected.to validate_inclusion_of(:time_display_relative).in_array([true, false]) } - it { is_expected.to validate_inclusion_of(:render_whitespace_in_code).in_array([true, false]) } - - it do - is_expected.to validate_numericality_of(:tab_width) - .only_integer - .is_greater_than_or_equal_to(Gitlab::TabWidth::MIN) - .is_less_than_or_equal_to(Gitlab::TabWidth::MAX) - end - describe 'diffs_deletion_color and diffs_addition_color' do using RSpec::Parameterized::TableSyntax diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index e0a216b9d634f1f59fcc69c4406695cf3b9e343d..9066b3f32bc43b654822575d211759d54304394e 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -666,10 +666,6 @@ end it { is_expected.to validate_presence_of(:projects_limit) } - it { is_expected.to define_enum_for(:project_view).with_values(%i(readme activity files wiki)) } - it { is_expected.to validate_inclusion_of(:hide_no_ssh_key).in_array([true, false]) } - it { is_expected.to validate_inclusion_of(:hide_no_password).in_array([true, false]) } - it { is_expected.to validate_inclusion_of(:notified_of_own_activity).in_array([true, false]) } it { is_expected.to validate_numericality_of(:projects_limit) } it { is_expected.to allow_value(0).for(:projects_limit) } it { is_expected.not_to allow_value(-1).for(:projects_limit) }