summaryrefslogtreecommitdiff
path: root/app/models/concerns
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-04-16 21:02:03 +0000
committerStan Hu <stanhu@gmail.com>2019-04-16 21:02:03 +0000
commitb0c0f81d549165e69ca871f94ed0154e30a8970c (patch)
treed1da2b13eeaf2f7a7b6391e0b7b5dbd476d2f722 /app/models/concerns
parent6f539ccbe97edab5d9e8d09f66fb7f6591de7729 (diff)
parente0b6838a90b47f34c1109b6a9727f249c6faebca (diff)
downloadgitlab-ce-b0c0f81d549165e69ca871f94ed0154e30a8970c.tar.gz
Merge branch '58361-issue-create-system-note-timestamp' into 'master'
Set correct timestamps when creating past issues Closes #58361 See merge request gitlab-org/gitlab-ce!27406
Diffstat (limited to 'app/models/concerns')
-rw-r--r--app/models/concerns/noteable.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/noteable.rb b/app/models/concerns/noteable.rb
index 423ce7e7db1..bfd0c36942b 100644
--- a/app/models/concerns/noteable.rb
+++ b/app/models/concerns/noteable.rb
@@ -13,7 +13,7 @@ module Noteable
end
end
- # The timestamp of the note (e.g. the :updated_at attribute if provided via
+ # The timestamp of the note (e.g. the :created_at or :updated_at attribute if provided via
# API call)
def system_note_timestamp
@system_note_timestamp || Time.now # rubocop:disable Gitlab/ModuleWithInstanceVariables