Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/services/deployments/after_create_service_spec.rb b/spec/services/deployments/after_create_service_spec.rb
index 6cdb4c88191..ee9b008c2f8 100644
--- a/spec/services/deployments/after_create_service_spec.rb
+++ b/spec/services/deployments/after_create_service_spec.rb
@@ -269,14 +269,14 @@ RSpec.describe Deployments::AfterCreateService do
           it "does not overwrite the older 'first_deployed_to_production_at' time" do
             # Previous deploy
             time = 5.minutes.from_now
-            Timecop.freeze(time) { service.execute }
+            travel_to(time) { service.execute }
 
             expect(merge_request.reload.metrics.merged_at).to be < merge_request.reload.metrics.first_deployed_to_production_at
 
             previous_time = merge_request.reload.metrics.first_deployed_to_production_at
 
             # Current deploy
-            Timecop.freeze(time + 12.hours) { service.execute }
+            travel_to(time + 12.hours) { service.execute }
 
             expect(merge_request.reload.metrics.first_deployed_to_production_at).to eq(previous_time)
           end