Merge branch 'task#104941754' into staging

# Conflicts:
#	lib/tasks/import.rake
This commit is contained in:
Vladimir Krylov 2015-10-30 12:45:33 +02:00
parent 821e864bc3
commit 84ea46912b

View file

@ -409,7 +409,7 @@ namespace :import do
Domain.import domain_columns, domains, {validate: false, timestamps: false}
Nameserver.import nameserver_columns, nameservers, {validate: false, timestamps: false}
Dnskey.import dnskey_columns, dnskeys, {validate: false, timestamps: false}
DomainContact.import domain_contact_columns, domain_contacts, {validate: false, timestamps: false}
DomainContact.import domain_contact_columns, domain_contacts, validate: false
puts '-----> Updating relations...'