Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 7 insertions, 1 deletions

diff --git a/app/models/audit_event.rb b/app/models/audit_event.rb
index 13fc2514f0c..e7cfa30a892 100644
--- a/app/models/audit_event.rb
+++ b/app/models/audit_event.rb
@@ -5,7 +5,7 @@ class AuditEvent < ApplicationRecord
   include IgnorableColumns
   include BulkInsertSafe
 
-  PARALLEL_PERSISTENCE_COLUMNS = [:author_name, :entity_path].freeze
+  PARALLEL_PERSISTENCE_COLUMNS = [:author_name, :entity_path, :target_details].freeze
 
   ignore_column :updated_at, remove_with: '13.4', remove_after: '2020-09-22'
 
@@ -58,6 +58,12 @@ class AuditEvent < ApplicationRecord
     end
   end
 
+  def as_json(options = {})
+    super(options).tap do |json|
+      json['ip_address'] = self.ip_address.to_s
+    end
+  end
+
   private
 
   def default_author_value