Merge branch '104525314-domain-object-states' into staging

This commit is contained in:
Matt Farnsworth 2015-11-20 16:55:11 +02:00
commit d78fa578d1
2 changed files with 1 additions and 5 deletions

View file

@ -694,7 +694,7 @@ class Domain < ActiveRecord::Base
def admin_status_update(update)
# check for deleted status
statuses.each do |s|
unless update.includes? s
unless update.include? s
case s
when DomainStatus::PENDING_DELETE
self.delete_at = nil