Merge branch '117131083-incorrect_force_delete_at_value' into staging

This commit is contained in:
Stas 2016-04-11 16:04:30 +03:00
commit d551c69e91

View file

@ -581,7 +581,7 @@ class Domain < ActiveRecord::Base
statuses << DomainStatus::SERVER_MANUAL_INZONE statuses << DomainStatus::SERVER_MANUAL_INZONE
end end
self.force_delete_at = (Time.zone.now + 31.days).beginning_of_day unless force_delete_at self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).beginning_of_day unless force_delete_at
transaction do transaction do
save!(validate: false) save!(validate: false)
registrar.messages.create!( registrar.messages.create!(