From 2b90cfcc29f0f7f85bdfc33bf3ab6d163e295a25 Mon Sep 17 00:00:00 2001
From: Roy Zwambag <rzwambag@gitlab.com>
Date: Tue, 11 Jul 2023 11:43:13 +0000
Subject: [PATCH] Revert "Merge branch '388393-validate-attribute-presence'
into 'master'"
This reverts merge request !125728
---
app/models/user.rb | 3 ---
app/models/user_preference.rb | 2 --
spec/models/user_preference_spec.rb | 10 ----------
spec/models/user_spec.rb | 4 ----
4 files changed, 19 deletions(-)
diff --git a/app/models/user.rb b/app/models/user.rb
index 93c15229e0398..7fd5d25d7e05d 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 78ccce2aaae25..e527542e35760 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 b2881d309249e..729635b5a27f1 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 e0a216b9d634f..9066b3f32bc43 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) }
--
GitLab