From 0495e2c8dda0a3dd05e84c8fb1f9f47a334473db Mon Sep 17 00:00:00 2001
From: carlad-gl <cdrago@gitlab.com>
Date: Tue, 16 Jul 2024 16:23:23 +0200
Subject: [PATCH] Remove ignores for imported column

Step three in removing the :imported column from
several tables of the DB. This MR removes the ignore_column
directives as the columns no longer exist in
the relevant tables.

Changelog: other
---
 app/models/design_management/design.rb | 3 ---
 app/models/event.rb                    | 3 ---
 app/models/issue.rb                    | 1 -
 app/models/merge_request.rb            | 1 -
 app/models/note.rb                     | 3 ---
 app/models/resource_label_event.rb     | 3 ---
 app/models/resource_milestone_event.rb | 3 ---
 app/models/resource_state_event.rb     | 3 ---
 app/models/snippet.rb                  | 3 ---
 9 files changed, 23 deletions(-)

diff --git a/app/models/design_management/design.rb b/app/models/design_management/design.rb
index 5b72e8036c7fb8..c5c0ca04510e4a 100644
--- a/app/models/design_management/design.rb
+++ b/app/models/design_management/design.rb
@@ -16,9 +16,6 @@ class Design < ApplicationRecord
     include Participable
     include CacheMarkdownField
     include Subscribable
-    include IgnorableColumns
-
-    ignore_column :imported, remove_with: '17.2', remove_after: '2024-07-22'
 
     cache_markdown_field :description
 
diff --git a/app/models/event.rb b/app/models/event.rb
index 7fc14974cf4c58..0ed7bbe8a03ea8 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -11,9 +11,6 @@ class Event < ApplicationRecord
   include ShaAttribute
   include EachBatch
   include Import::HasImportSource
-  include IgnorableColumns
-
-  ignore_column :imported, remove_with: '17.2', remove_after: '2024-07-22'
 
   ACTIONS = HashWithIndifferentAccess.new(
     created: 1,
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 4cc87a4912aa67..2add23cac7df14 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -58,7 +58,6 @@ class Issue < ApplicationRecord
 
   # prevent caching this column by rails, as we want to easily remove it after the backfilling
   ignore_column :tmp_epic_id, remove_with: '16.11', remove_after: '2024-03-31'
-  ignore_column :imported, remove_with: '17.2', remove_after: '2024-07-22'
 
   belongs_to :project
   belongs_to :namespace, inverse_of: :issues
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index fb08ed4273531c..f0e4f4df52bbba 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -25,7 +25,6 @@ class MergeRequest < ApplicationRecord
   include Todoable
   include Spammable
 
-  ignore_column :imported, remove_with: '17.2', remove_after: '2024-07-22'
   ignore_columns :head_pipeline_id_convert_to_bigint, remove_with: '17.1', remove_after: '2024-06-14'
 
   extend ::Gitlab::Utils::Override
diff --git a/app/models/note.rb b/app/models/note.rb
index effa0d0b9e07f4..1a763e09f6c3b1 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -27,9 +27,6 @@ class Note < ApplicationRecord
   include Sortable
   include EachBatch
   include Spammable
-  include IgnorableColumns
-
-  ignore_column :imported, remove_with: '17.2', remove_after: '2024-07-22'
 
   cache_markdown_field :note, pipeline: :note, issuable_reference_expansion_enabled: true
 
diff --git a/app/models/resource_label_event.rb b/app/models/resource_label_event.rb
index 98132f9aa6ba9b..5ee6f03047e440 100644
--- a/app/models/resource_label_event.rb
+++ b/app/models/resource_label_event.rb
@@ -4,11 +4,8 @@ class ResourceLabelEvent < ResourceEvent
   include CacheMarkdownField
   include MergeRequestResourceEvent
   include Import::HasImportSource
-  include IgnorableColumns
   include FromUnion
 
-  ignore_column :imported, remove_with: '17.2', remove_after: '2024-07-22'
-
   cache_markdown_field :reference
 
   belongs_to :label
diff --git a/app/models/resource_milestone_event.rb b/app/models/resource_milestone_event.rb
index 4a320ae6047372..ba16a986ce267a 100644
--- a/app/models/resource_milestone_event.rb
+++ b/app/models/resource_milestone_event.rb
@@ -3,9 +3,6 @@
 class ResourceMilestoneEvent < ResourceTimeboxEvent
   include EachBatch
   include Import::HasImportSource
-  include IgnorableColumns
-
-  ignore_column :imported, remove_with: '17.2', remove_after: '2024-07-22'
 
   belongs_to :milestone
 
diff --git a/app/models/resource_state_event.rb b/app/models/resource_state_event.rb
index 6eaf85b9ce7543..3b54a0cc43173a 100644
--- a/app/models/resource_state_event.rb
+++ b/app/models/resource_state_event.rb
@@ -4,11 +4,8 @@ class ResourceStateEvent < ResourceEvent
   include MergeRequestResourceEvent
   include Importable
   include Import::HasImportSource
-  include IgnorableColumns
   include FromUnion
 
-  ignore_column :imported, remove_with: '17.2', remove_after: '2024-07-22'
-
   validate :exactly_one_issuable, unless: :importing?
 
   belongs_to :source_merge_request, class_name: 'MergeRequest', foreign_key: :source_merge_request_id
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index c8858a7e1e660a..93acff57547c78 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -20,9 +20,6 @@ class Snippet < ApplicationRecord
   include CreatedAtFilterable
   include EachBatch
   include Import::HasImportSource
-  include IgnorableColumns
-
-  ignore_column :imported, remove_with: '17.2', remove_after: '2024-07-22'
 
   MAX_FILE_COUNT = 10
 
-- 
GitLab