diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
| commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
| tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/services/audit_event_service.rb | |
| parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/services/audit_event_service.rb')
| -rw-r--r-- | app/services/audit_event_service.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/services/audit_event_service.rb b/app/services/audit_event_service.rb index 3c21844ec62..d1558c60c3d 100644 --- a/app/services/audit_event_service.rb +++ b/app/services/audit_event_service.rb @@ -16,7 +16,7 @@ class AuditEventService @author = build_author(author) @entity = entity @details = details - @ip_address = (@details[:ip_address].presence || @author.current_sign_in_ip) + @ip_address = resolve_ip_address(@details, @author) end # Builds the @details attribute for authentication @@ -64,6 +64,12 @@ class AuditEventService end end + def resolve_ip_address(details, author) + details[:ip_address].presence || + Gitlab::RequestContext.instance.client_ip || + author.current_sign_in_ip + end + def base_payload { author_id: @author.id, |