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

Conflicts:
	db/schema.rb
This commit is contained in:
Andres Keskküla 2014-09-25 15:30:20 +03:00
commit 641522ff08
31 changed files with 513 additions and 30 deletions

View file

@ -5,4 +5,5 @@ describe Registrar do
it { should have_many(:domains) }
it { should have_many(:ns_sets) }
it { should have_many(:epp_users) }
it { should have_many(:users) }
end

View file

@ -2,4 +2,5 @@ require 'rails_helper'
describe User do
it { should belong_to(:role) }
it { should belong_to(:registrar) }
end