diff options
Diffstat (limited to 'lib/bitbucket_server/representation/activity.rb')
| -rw-r--r-- | lib/bitbucket_server/representation/activity.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bitbucket_server/representation/activity.rb b/lib/bitbucket_server/representation/activity.rb index 2e6082bea87..a594b0881f6 100644 --- a/lib/bitbucket_server/representation/activity.rb +++ b/lib/bitbucket_server/representation/activity.rb @@ -38,11 +38,11 @@ module BitbucketServer def merge_timestamp timestamp = raw.dig('commit', 'committerTimestamp') - Time.at(timestamp / 1000.0) if timestamp.is_a?(Integer) + self.class.convert_timestamp(timestamp) end def created_at - Time.at(created_date / 1000) if created_date.is_a?(Integer) + self.class.convert_timestamp(created_date) end private |