Merge branch 'master' into status-refactor

Conflicts:
	app/models/domain.rb
	db/schema.rb
This commit is contained in:
Martin Lensment 2015-06-16 16:20:59 +03:00
commit 4bf5a968bd
29 changed files with 4911 additions and 49 deletions

View file

@ -20,7 +20,6 @@ class Registrant::DomainUpdateConfirmsController < RegistrantController
@registrant_verification = RegistrantVerification.new(domain_id: @domain.id,
domain_name: @domain.name,
verification_token: params[:token])
if params[:rejected]
if @registrant_verification.domain_registrant_change_reject!
flash[:notice] = t(:registrant_domain_verification_rejected)