diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /app/models/audit_event.rb | |
parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'app/models/audit_event.rb')
-rw-r--r-- | app/models/audit_event.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/models/audit_event.rb b/app/models/audit_event.rb index 35c4e08730e..8e8e9389e2d 100644 --- a/app/models/audit_event.rb +++ b/app/models/audit_event.rb @@ -69,8 +69,7 @@ class AuditEvent < ApplicationRecord end def author - lazy_author&.itself.presence || - ::Gitlab::Audit::NullAuthor.for(author_id, (self[:author_name] || details[:author_name])) + lazy_author&.itself.presence || default_author_value end def lazy_author @@ -98,7 +97,7 @@ class AuditEvent < ApplicationRecord end def default_author_value - ::Gitlab::Audit::NullAuthor.for(author_id, (self[:author_name] || details[:author_name])) + ::Gitlab::Audit::NullAuthor.for(author_id, self) end def parallel_persist |