summaryrefslogtreecommitdiff
path: root/app/services/audit_event_service.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-20 12:26:25 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-20 12:26:25 +0000
commita09983ae35713f5a2bbb100981116d31ce99826e (patch)
tree2ee2af7bd104d57086db360a7e6d8c9d5d43667a /app/services/audit_event_service.rb
parent18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff)
downloadgitlab-ce-a09983ae35713f5a2bbb100981116d31ce99826e.tar.gz
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/services/audit_event_service.rb')
-rw-r--r--app/services/audit_event_service.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/services/audit_event_service.rb b/app/services/audit_event_service.rb
index fb309aed649..fef733a7d09 100644
--- a/app/services/audit_event_service.rb
+++ b/app/services/audit_event_service.rb
@@ -16,6 +16,7 @@ class AuditEventService
@author = build_author(author)
@entity = entity
@details = details
+ @ip_address = (@details[:ip_address].presence || @author.current_sign_in_ip)
end
# Builds the @details attribute for authentication
@@ -49,6 +50,8 @@ class AuditEventService
private
+ attr_reader :ip_address
+
def build_author(author)
case author
when User
@@ -61,6 +64,7 @@ class AuditEventService
def base_payload
{
author_id: @author.id,
+ author_name: @author.name,
entity_id: @entity.id,
entity_type: @entity.class.name
}