From 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 18 Jun 2020 11:18:50 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-1-stable-ee --- spec/models/environment_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/models/environment_spec.rb') diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb index c0b2a4ae984..b93da518b68 100644 --- a/spec/models/environment_spec.rb +++ b/spec/models/environment_spec.rb @@ -1061,7 +1061,7 @@ describe Environment, :use_clean_rails_memory_store_caching do end context 'when time window arguments are provided' do - let(:metric_params) { [1552642245.067, Time.now] } + let(:metric_params) { [1552642245.067, Time.current] } it 'queries with the expected parameters' do expect(environment.prometheus_adapter) -- cgit v1.2.1