From 6c3480f7a1ea4657c196ce47490c677117aa313e Mon Sep 17 00:00:00 2001
From: Krasimir Angelov <kangelov@gitlab.com>
Date: Thu, 18 Jan 2024 14:28:58 +1300
Subject: [PATCH] Remove ingnore rule for incoming_email_token

This is the last step 5 from the process of extracting the column into a
new table.

https://gitlab.com/gitlab-org/gitlab/-/issues/430906
---
 app/models/user.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 4add936c02581bf7..034aec1bc46af340 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -31,9 +31,6 @@ class User < MainClusterwide::ApplicationRecord
   include EachBatch
   include CrossDatabaseIgnoredTables
   include UseSqlFunctionForPrimaryKeyLookups
-  include IgnorableColumns
-
-  ignore_column :incoming_email_token, remove_with: '17.0', remove_after: '2024-04-18'
 
   # `ensure_namespace_correct` needs to be moved to an after_commit (?)
   cross_database_ignore_tables %w[namespaces namespace_settings], url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/424279'
-- 
GitLab