Merge branch '266952-remove-ignore-rule-type-column' into 'master'

Remove ignore column code on `type` field

See merge request gitlab-org/gitlab!46189

app/models/audit_event.rb

@@ -2,7 +2,6 @@
 
 class AuditEvent < ApplicationRecord
   include CreatedAtFilterable
-  include IgnorableColumns
   include BulkInsertSafe
   include EachBatch
 
@@ -14,8 +13,6 @@ class AuditEvent < ApplicationRecord
     :target_id
   ].freeze
 
-  ignore_column :type, remove_with: '13.6', remove_after: '2020-11-22'
-
   serialize :details, Hash # rubocop:disable Cop/ActiveRecordSerialize
 
   belongs_to :user, foreign_key: :author_id
@@ -37,14 +34,6 @@ class AuditEvent < ApplicationRecord
   # https://gitlab.com/groups/gitlab-org/-/epics/2765
   after_validation :parallel_persist
 
-  # Note: After loading records, do not attempt to type cast objects it finds.
-  # We are in the process of deprecating STI (i.e. SecurityEvent) out of AuditEvent.
-  #
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/216845
-  def self.inheritance_column
-    :_type_disabled
-  end
-
   def self.order_by(method)
     case method.to_s
     when 'created_asc'