Merge remote-tracking branch 'glitch/main'

- Remove Helm charts
- Lots of conflicts with our removal of recommended settings and custom
  icons

1 files changed, 11 insertions, 0 deletions

diff --git a/app/lib/inline_renderer.rb b/app/lib/inline_renderer.rb
index b70814748..4bb240b48 100644
--- a/app/lib/inline_renderer.rb
+++ b/app/lib/inline_renderer.rb
@@ -11,6 +11,7 @@ class InlineRenderer
     case @template
     when :status
       serializer = REST::StatusSerializer
+      preload_associations_for_status
     when :notification
       serializer = REST::NotificationSerializer
     when :conversation
@@ -35,6 +36,16 @@ class InlineRenderer
 
   private
 
+  def preload_associations_for_status
+    ActiveRecord::Associations::Preloader.new.preload(@object, {
+      active_mentions: :account,
+
+      reblog: {
+        active_mentions: :account,
+      },
+    })
+  end
+
   def current_user
     @current_account&.user
   end