Merge branch 'master' into tailwind-redesign

This commit is contained in:
drusepth 2022-08-15 12:46:08 -07:00
commit 527738338d
2 changed files with 2 additions and 0 deletions

View File

@ -229,6 +229,7 @@
</div>
<ul class="collapsible">
<% event.timeline_event_entities.order('entity_type').preload(:entity).group_by(&:entity_type).each do |entity_type, entity_list| %>
<% entity_list.reject! { |te_entity| te_entity.entity.nil? } %>
<li>
<% klass = content_class_from_name(entity_type) %>
<div class="collapsible-header">

View File

@ -96,6 +96,7 @@
</div>
<ul class="collapsible">
<% event_entities.each do |entity_type, entity_list| %>
<% entity_list.reject! { |te_entity| te_entity.entity.nil? } %>
<li>
<% klass = content_class_from_name(entity_type) %>
<div class="collapsible-header">