merge changes

This commit is contained in:
Georg Kahest 2015-12-08 13:49:34 +02:00
commit 66959f49d0
4 changed files with 12 additions and 14 deletions

View file

@ -61,8 +61,6 @@ class Contact < ActiveRecord::Base
manage_ok
end
after_save :update_related_whois_records
# for overwrite when doing children loop
attr_writer :domains_present

View file

@ -647,7 +647,7 @@ class Domain < ActiveRecord::Base
registrar.messages.create!(
body: I18n.t('force_delete_set_on_domain', domain: name)
)
DomainMailer.force_delete(id, deliver_emails).deliver
DomainMailer.force_delete(id, true).deliver
return true
end
false