Merge branch '117131083-incorrect_force_delete_at_value' into staging

This commit is contained in:
Stas 2016-04-13 01:15:27 +03:00
commit 14b9c347d5
2 changed files with 4 additions and 4 deletions

View file

@ -600,7 +600,7 @@ class Epp::Domain < Domain
msg: I18n.t(:object_status_prohibits_operation)
} unless pending_deletable?
self.delete_at = Time.zone.now + Setting.redemption_grace_period.days
self.delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).beginning_of_day.utc
set_pending_delete
set_server_hold if server_holdable?
save(validate: false)