Merge branch 'master' of github.com:domify/registry into country-refactor

Conflicts:
	app/models/address.rb
	app/models/country_deprecated.rb
	app/models/registrar.rb
	db/schema.rb
This commit is contained in:
Martin Lensment 2015-02-02 11:42:21 +02:00
commit 7537bb3712
91 changed files with 1614 additions and 698 deletions

View file

@ -1,4 +1,6 @@
class Address < ActiveRecord::Base
include Versions # version/address_version.rb
LOCAL_TYPE_SHORT = 'loc'
INTERNATIONAL_TYPE_SHORT = 'int'
LOCAL_TYPE = 'LocalAddress'
@ -9,8 +11,6 @@ class Address < ActiveRecord::Base
belongs_to :contact
has_paper_trail class_name: 'AddressVersion'
def country
Country.new(country_code)
end