Merge remote-tracking branch 'origin/master' into 110163446-confirm_emails

This commit is contained in:
Stas 2016-01-04 15:18:11 +02:00
commit 24862ba16d
45 changed files with 794 additions and 388 deletions

View file

@ -12,7 +12,6 @@ class RegistrantVerification < ActiveRecord::Base
belongs_to :domain
validates :verification_token, :domain_name, :domain, :action, :action_type, presence: true
validates :domain, uniqueness: { scope: [:domain_id, :verification_token] }
def domain_registrant_change_confirm!
self.action_type = DOMAIN_REGISTRANT_CHANGE