From 9f46488805e86b1bc341ea1620b866016c2ce5ed Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 20 May 2020 14:34:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-0-stable-ee --- app/services/verify_pages_domain_service.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/services/verify_pages_domain_service.rb') diff --git a/app/services/verify_pages_domain_service.rb b/app/services/verify_pages_domain_service.rb index b53c3145caf..a9e219547d7 100644 --- a/app/services/verify_pages_domain_service.rb +++ b/app/services/verify_pages_domain_service.rb @@ -37,7 +37,7 @@ class VerifyPagesDomainService < BaseService # Prevent any pre-existing grace period from being truncated reverify = [domain.enabled_until, VERIFICATION_PERIOD.from_now].compact.max - domain.assign_attributes(verified_at: Time.now, enabled_until: reverify, remove_at: nil) + domain.assign_attributes(verified_at: Time.current, enabled_until: reverify, remove_at: nil) domain.save!(validate: false) if was_disabled @@ -73,7 +73,7 @@ class VerifyPagesDomainService < BaseService # A domain is only expired until `disable!` has been called def expired? - domain.enabled_until && domain.enabled_until < Time.now + domain.enabled_until && domain.enabled_until < Time.current end def dns_record_present? -- cgit v1.2.3