mirror of
https://github.com/indentlabs/notebook.git
synced 2025-10-26 11:19:22 +00:00
Merge branch 'master' into tailwind-redesign
This commit is contained in:
commit
527738338d
@ -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">
|
||||
|
||||
@ -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">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user