Merge branch 'story/105754008-confirm-domain-change' into staging

This commit is contained in:
Vladimir Krylov 2015-10-26 17:43:12 +02:00
commit 1dae408afe
2 changed files with 4 additions and 1 deletions

View file

@ -456,6 +456,7 @@ class Epp::Domain < Domain
user = ApiUser.find(pending_json['current_user_id'])
frame = Nokogiri::XML(pending_json['frame'])
statuses.delete(DomainStatus::PENDING_UPDATE)
yield(self) if block_given? # need to skip statuses check here
return unless update(frame, user, false)
clean_pendings!