Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-02-10 03:11:55 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-02-10 03:11:55 +0300
commit3f22924df411018ba665ecf72ab0768d61173477 (patch)
tree511da0ef74e33f241ecc50d50c7a57a1ac51a06f /app/models
parentd183d2d76bcc25f983c0836805c712af096bcc2f (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
-rw-r--r--app/models/audit_event.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/audit_event.rb b/app/models/audit_event.rb
index 4d92cb1becf..3312216932b 100644
--- a/app/models/audit_event.rb
+++ b/app/models/audit_event.rb
@@ -65,7 +65,9 @@ class AuditEvent < ApplicationRecord
end
def formatted_details
- details.merge(details.slice(:from, :to).transform_values(&:to_s))
+ details
+ .merge(details.slice(:from, :to).transform_values(&:to_s))
+ .merge(author_email: author.try(:email))
end
def author