Merge branch '109818884-server-hold-sets-force_delete_at' into staging

This commit is contained in:
Stas 2016-01-26 16:28:59 +02:00
commit f6dd5793a4

View file

@ -744,7 +744,8 @@ class Domain < ActiveRecord::Base
!update.include?(DomainStatus::SERVER_HOLD)
if self.statuses.include?(DomainStatus::EXPIRED)
self.outzone_at = Time.zone.now
#self.outzone_at = Time.zone.now + 1.day
self.outzone_at = self.valid_to
else
self.outzone_at = nil
end