Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-10-03 12:10:16 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-10-03 12:10:16 +0300
commit49bd8609775923402610f4c7f7c1f8aa1efdfe7e (patch)
treeb91150090cc5b23d1b6cd79ee038b2b93a8ab385 /app/models/users
parent9e7d45afd74a71be22c2413f4857d4389e360a42 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/users')
-rw-r--r--app/models/users/phone_number_validation.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/users/phone_number_validation.rb b/app/models/users/phone_number_validation.rb
index 52f16a7861f..e033445d76b 100644
--- a/app/models/users/phone_number_validation.rb
+++ b/app/models/users/phone_number_validation.rb
@@ -2,9 +2,13 @@
module Users
class PhoneNumberValidation < ApplicationRecord
+ include IgnorableColumns
+
self.primary_key = :user_id
self.table_name = 'user_phone_number_validations'
+ ignore_column :verification_attempts, remove_with: '16.7', remove_after: '2023-11-17'
+
belongs_to :user, foreign_key: :user_id
belongs_to :banned_user, class_name: '::Users::BannedUser', foreign_key: :user_id