about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-09-08 01:24:26 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-09-08 01:24:26 +0200
commit0f4bc567195d368de596cdeeee6bc0b6507ae95e (patch)
treeb6ef5fbeb1103203dae8237d8b26379664a397f3 /app/controllers
parent87576e1ab1a4c02f8847e8264e6a62abd36df793 (diff)
Improving production logs, removing n+1 on media attachments in atom,
adding attachments display to static views
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/accounts_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 162e85dec..3c02e0bec 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -11,7 +11,7 @@ class AccountsController < ApplicationController
       format.atom do
         @entries = @account.stream_entries.order('id desc').with_includes.paginate_by_max_id(20, params[:max_id] || nil)
 
-        ActiveRecord::Associations::Preloader.new.preload(@entries.select { |a| a.activity_type == 'Status' }, activity: [:mentions, reblog: :account, thread: :account])
+        ActiveRecord::Associations::Preloader.new.preload(@entries.select { |a| a.activity_type == 'Status' }, activity: [:mentions, :media_attachments, reblog: :account, thread: :account])
         ActiveRecord::Associations::Preloader.new.preload(@entries.select { |a| a.activity_type == 'Favourite' }, activity: [:account, :status])
         ActiveRecord::Associations::Preloader.new.preload(@entries.select { |a| a.activity_type == 'Follow' }, activity: :target_account)
       end