Merge branch 'master' of github.com:domify/registry

This commit is contained in:
Martin Lensment 2015-08-12 17:59:03 +03:00
commit a447c8653c
29 changed files with 288 additions and 242 deletions

View file

@ -367,6 +367,8 @@ class Domain < ActiveRecord::Base
self.pending_json = {}
statuses.delete(DomainStatus::PENDING_UPDATE)
statuses.delete(DomainStatus::PENDING_DELETE)
status_notes[DomainStatus::PENDING_UPDATE] = ''
status_notes[DomainStatus::PENDING_DELETE] = ''
save
end