Merge branch 'story/115762063--show-historical-nested' into staging

# Conflicts:
#	app/models/domain.rb
#	app/views/admin/domains/partials/_version.haml
#	config/locales/en.yml
This commit is contained in:
Vladimir Krylov 2016-03-23 18:30:34 +02:00
commit f69c4ef919
7 changed files with 155 additions and 86 deletions

View file

@ -746,6 +746,7 @@ class Domain < ActiveRecord::Base
log[:dnskeys] = dnskey_ids
log[:legal_documents]= [legal_document_id]
log[:registrant] = [registrant_id]
log[:dnskeys] = dnskeys_ids
log
end