diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 21:09:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 21:09:35 +0300 |
commit | 3a9076e0a4c28af9a1a40ed5e181b70fb1b659de (patch) | |
tree | 3d531c50bec43c1845c7d74f76442b7a6f49849f /app/models/audit_event.rb | |
parent | 2d8454515e7b631a8f39a6415c86154d6c62841c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/audit_event.rb')
-rw-r--r-- | app/models/audit_event.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/audit_event.rb b/app/models/audit_event.rb index 3d36214a178..13fc2514f0c 100644 --- a/app/models/audit_event.rb +++ b/app/models/audit_event.rb @@ -5,6 +5,8 @@ class AuditEvent < ApplicationRecord include IgnorableColumns include BulkInsertSafe + PARALLEL_PERSISTENCE_COLUMNS = [:author_name, :entity_path].freeze + ignore_column :updated_at, remove_with: '13.4', remove_after: '2020-09-22' serialize :details, Hash # rubocop:disable Cop/ActiveRecordSerialize @@ -19,8 +21,6 @@ class AuditEvent < ApplicationRecord scope :by_entity_id, -> (entity_id) { where(entity_id: entity_id) } scope :by_author_id, -> (author_id) { where(author_id: author_id) } - PARALLEL_PERSISTENCE_COLUMNS = [:author_name].freeze - after_initialize :initialize_details # Note: The intention is to remove this once refactoring of AuditEvent # has proceeded further. |