diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-19 09:08:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-19 09:08:03 +0300 |
| commit | 4e81d9c050bfea4c866329155c17b929d7381340 (patch) | |
| tree | 70fd5d3445f0b285650e068a6e99e970ceee5e00 /app/services/verify_pages_domain_service.rb | |
| parent | fdfde5a37a82274d7babf2519fc802c03e728622 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/verify_pages_domain_service.rb')
| -rw-r--r-- | app/services/verify_pages_domain_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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? |