diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-13 00:10:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-13 00:10:47 +0300 |
| commit | eb489ab3e7e208a136ea47b3589cc5e3a41ed5d5 (patch) | |
| tree | 7b85c6fe51dd5f79b4697820a0b779866889950e /app/services/resource_events | |
| parent | 141ef7e93971ca11f404065554f6cc1e43e46a80 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/resource_events')
| -rw-r--r-- | app/services/resource_events/change_state_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/resource_events/change_state_service.rb b/app/services/resource_events/change_state_service.rb index cd6d82df46f..c5120ba82e1 100644 --- a/app/services/resource_events/change_state_service.rb +++ b/app/services/resource_events/change_state_service.rb @@ -19,7 +19,7 @@ module ResourceEvents state: ResourceStateEvent.states[state], close_after_error_tracking_resolve: close_after_error_tracking_resolve, close_auto_resolve_prometheus_alert: close_auto_resolve_prometheus_alert, - created_at: Time.zone.now + created_at: resource.system_note_timestamp ) resource.expire_note_etag_cache |