Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 2 deletions

diff --git a/app/services/resource_events/base_synthetic_notes_builder_service.rb b/app/services/resource_events/base_synthetic_notes_builder_service.rb
index 1b85ca811a1..db8bf6e4b74 100644
--- a/app/services/resource_events/base_synthetic_notes_builder_service.rb
+++ b/app/services/resource_events/base_synthetic_notes_builder_service.rb
@@ -26,7 +26,7 @@ module ResourceEvents
     def since_fetch_at(events)
       return events unless params[:last_fetched_at].present?
 
-      last_fetched_at = Time.at(params.fetch(:last_fetched_at).to_i)
+      last_fetched_at = Time.zone.at(params.fetch(:last_fetched_at).to_i)
       events.created_after(last_fetched_at - NotesFinder::FETCH_OVERLAP)
     end
 
diff --git a/app/services/resource_events/change_milestone_service.rb b/app/services/resource_events/change_milestone_service.rb
index f09c2e1d735..82c3e2acad5 100644
--- a/app/services/resource_events/change_milestone_service.rb
+++ b/app/services/resource_events/change_milestone_service.rb
@@ -4,7 +4,7 @@ module ResourceEvents
   class ChangeMilestoneService
     attr_reader :resource, :user, :event_created_at, :milestone, :old_milestone
 
-    def initialize(resource, user, created_at: Time.now, old_milestone:)
+    def initialize(resource, user, created_at: Time.current, old_milestone:)
       @resource = resource
       @user = user
       @event_created_at = created_at