summaryrefslogtreecommitdiff
path: root/app/services/note_summary.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-06-03 15:09:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-03 15:09:26 +0000
commitf5f6cb45c73c8aa059c3006a3696014522a41a4b (patch)
treebde1e1c22c83276f49858e827909a1e13ef0f0c2 /app/services/note_summary.rb
parentc74f702c747d1b14c3ddea951ceb7970941dc8f5 (diff)
downloadgitlab-ce-f5f6cb45c73c8aa059c3006a3696014522a41a4b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/note_summary.rb')
-rw-r--r--app/services/note_summary.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/note_summary.rb b/app/services/note_summary.rb
index 6fe14939aaa..0f2555b9ff0 100644
--- a/app/services/note_summary.rb
+++ b/app/services/note_summary.rb
@@ -4,9 +4,9 @@ class NoteSummary
attr_reader :note
attr_reader :metadata
- def initialize(noteable, project, author, body, action: nil, commit_count: nil)
+ def initialize(noteable, project, author, body, action: nil, commit_count: nil, created_at: nil)
@note = { noteable: noteable,
- created_at: noteable.system_note_timestamp,
+ created_at: created_at || noteable.system_note_timestamp,
project: project, author: author, note: body }
@metadata = { action: action, commit_count: commit_count }.compact