Commit c39f057a authored by Tan Le's avatar Tan Le

Remove ignore column code on `type` field

parent 3186e349
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
class AuditEvent < ApplicationRecord class AuditEvent < ApplicationRecord
include CreatedAtFilterable include CreatedAtFilterable
include IgnorableColumns
include BulkInsertSafe include BulkInsertSafe
include EachBatch include EachBatch
...@@ -14,8 +13,6 @@ class AuditEvent < ApplicationRecord ...@@ -14,8 +13,6 @@ class AuditEvent < ApplicationRecord
:target_id :target_id
].freeze ].freeze
ignore_column :type, remove_with: '13.6', remove_after: '2020-11-22'
serialize :details, Hash # rubocop:disable Cop/ActiveRecordSerialize serialize :details, Hash # rubocop:disable Cop/ActiveRecordSerialize
belongs_to :user, foreign_key: :author_id belongs_to :user, foreign_key: :author_id
...@@ -37,14 +34,6 @@ class AuditEvent < ApplicationRecord ...@@ -37,14 +34,6 @@ class AuditEvent < ApplicationRecord
# https://gitlab.com/groups/gitlab-org/-/epics/2765 # https://gitlab.com/groups/gitlab-org/-/epics/2765
after_validation :parallel_persist 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) def self.order_by(method)
case method.to_s case method.to_s
when 'created_asc' when 'created_asc'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment