diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-22 09:08:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-22 09:08:09 +0000 |
| commit | 4a3ba3e5f261eb09e6b2b4fd44373e7a1c454a72 (patch) | |
| tree | 1a94467252ebcc5575c7de6a3590360ce05b9967 /app/models/concerns/noteable.rb | |
| parent | 707c0eca50cf9a5290806ce637be30f4c7288def (diff) | |
| download | gitlab-ce-4a3ba3e5f261eb09e6b2b4fd44373e7a1c454a72.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/noteable.rb')
| -rw-r--r-- | app/models/concerns/noteable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/noteable.rb b/app/models/concerns/noteable.rb index 933a0b167e2..183b902dd37 100644 --- a/app/models/concerns/noteable.rb +++ b/app/models/concerns/noteable.rb @@ -24,7 +24,7 @@ module Noteable # 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 + @system_note_timestamp || Time.current # rubocop:disable Gitlab/ModuleWithInstanceVariables end attr_writer :system_note_timestamp |