Merge branch 'registry-460' into registry-475-refactor-zones

# Conflicts:
#	db/seeds.rb
This commit is contained in:
Artur Beljajev 2017-04-23 14:04:08 +03:00
commit eeb4849c1e

View file

@ -33,15 +33,4 @@ ActiveRecord::Base.transaction do
country_code: 'US', country_code: 'US',
roles: ['admin'] roles: ['admin']
) )
DNS::Zone.create!(
origin: 'tld',
ttl: 43200,
refresh: 3600,
retry: 900,
expire: 1209600,
minimum_ttl: 3600,
email: 'admin.domain.tld',
master_nameserver: 'ns.tld'
)
end end