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

app/models/concerns/versions.rb

@@ -3,6 +3,7 @@ module Versions
   extend ActiveSupport::Concern
 
   included do
+    attr_accessor :version_loader
     has_paper_trail class_name: "#{model_name}Version"
 
     # add creator and updator
@@ -55,4 +56,23 @@ module Versions
       domains.each(&:touch_with_version)
     end
   end
+
+  module ClassMethods
+    def all_versions_for(ids, time)
+      ver_klass    = paper_trail_version_class
+      from_history = ver_klass.where(item_id: ids).
+          order(:item_id).
+          preceding(time + 1, true).
+          select("distinct on (item_id) #{ver_klass.table_name}.*").
+          map do |ver|
+            o = new(ver.object)
+            o.version_loader = ver
+            ver.object_changes.to_h.each { |k, v| o[k]=v[-1] }
+            o
+          end
+      not_in_history = where(id: (ids - from_history.map(&:id)))
+
+      from_history + not_in_history
+    end
+  end
 end

app/models/domain.rb

@@ -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