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

Conflicts:
	config/locales/en.yml
	db/schema.rb
This commit is contained in:
Martin Lensment 2015-05-19 17:26:32 +03:00
commit 2fb632b7a9
21 changed files with 298 additions and 54 deletions

View file

@ -10,7 +10,10 @@ describe RegistrantVerification do
@registrant_verification.valid?
@registrant_verification.errors.full_messages.should match_array([
"Domain name is missing",
"Verification token is missing"
"Verification token is missing",
"Action is missing",
"Action type is missing",
"Domain is missing"
])
end
end