Merge branch '108869472-objects_archive' into staging

# Conflicts:
#	app/views/admin/domain_versions/show.haml

app/views/admin/domain_versions/archive.haml

@@ -56,14 +56,19 @@
         %tbody
           - @versions.each do |version|
             - if version
-            - domain = Domain.new(version.object.to_h)
-            - version.object_changes.to_h.each{|k,v| domain[k]=v.last}
+              - domain = Domain.new(version.object.to_h)
+              - version.object_changes.to_h.each{|k,v| domain[k]=v.last}
 
               %tr
                 %td= link_to(domain.name, admin_domain_version_path(version.id))
                 %td
                   - if domain.registrant
-                    = domain.registrant
+                    = domain.registrant.name
+                  - else
+                    - contact = Contact.all_versions_for([domain.registrant_id], version.created_at).first
+                    - if contact.nil? && ver = ContactVersion.where(item_id: domain.registrant_id).last
+                      - contact = Contact.new(ver.object.to_h.merge(ver.object_changes.to_h.each_with_object({}){|(k,v), o| o[k]=v.last } ))
+                    = contact.try(:name)
                 %td
                   - if domain.registrar
                     = link_to(domain.registrar, admin_registrar_path(domain.registrar))

app/views/admin/domain_versions/show.haml

@@ -98,7 +98,7 @@
             = link_to admin_registrar_path(domain.registrar), target: "registrar_#{domain.registrar.id}" do
               = domain.registrar.name
       %span{:style => "margin: 20px 20px; clear:both;"}
-      
+
         - if @version.previous
           = link_to(t(:previous),
                     admin_domain_version_path(@version.previous.id),