diff --git a/app/models/design_management/design.rb b/app/models/design_management/design.rb index 5b72e8036c7fb8f833d4eb5b8a2bef9e0d4254ac..c5c0ca04510e4a95864176b81db8beb004d7e0d9 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 7fc14974cf4c5808d8d700b8e6b609aefb290306..0ed7bbe8a03ea827de1f0f8b0e727aee26eb695f 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 4cc87a4912aa6793763bee04a497361c937c9601..2add23cac7df146595a9aa57bf48d742a7fbeea7 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 fb08ed4273531c2a8f5063cbe7236914e423cf47..f0e4f4df52bbba188c05f79f44660b8941ee190f 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 effa0d0b9e07f43d15f5b14fdcd7757e42ec8245..1a763e09f6c3b166bfb1ecf38f86847ab9a0d29a 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 98132f9aa6ba9b0e0018c8eed6d73a3ef47a97bd..5ee6f03047e440c3ca69d0ac9a16efb7cd77d274 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 4a320ae6047372e56367c7bf93bef82233b52b9c..ba16a986ce267abee376c1d3eba695a43e52c4ba 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 6eaf85b9ce7543d31e64e4375fb55d8c378825e6..3b54a0cc43173abbb473a8825cd2fe365fcde271 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 c8858a7e1e660ad721a9d1f2cd2970ddec8c358d..93acff57547c78d2eca094ccc5562e459d66eb79 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