diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-19 09:10:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-19 09:10:04 +0300 |
| commit | 0bfb62457ba5122c9bf30bed3ecd20759a9a16bd (patch) | |
| tree | 8e18296b4f9b889df037dd07d634884a7566ed8c /lib/gitlab/incident_management | |
| parent | 7fdacd20dec0db3507643c7e89e9f3d35892adef (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/incident_management')
| -rw-r--r-- | lib/gitlab/incident_management/pager_duty/incident_issue_description.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/incident_management/pager_duty/incident_issue_description.rb b/lib/gitlab/incident_management/pager_duty/incident_issue_description.rb index cd947b15154..768c8bb4cbb 100644 --- a/lib/gitlab/incident_management/pager_duty/incident_issue_description.rb +++ b/lib/gitlab/incident_management/pager_duty/incident_issue_description.rb @@ -32,7 +32,7 @@ module Gitlab end def incident_created_at - Time.parse(incident_payload['created_at']) + Time.zone.parse(incident_payload['created_at']) rescue Time.current.utc # PagerDuty provides time in UTC end |