diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-26 13:42:10 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-26 13:42:10 +0100 |
commit | 85b00d19b840bae98322c2372e8e0e3ebd66f2e0 (patch) | |
tree | 7eee05cd92cdcc0b97a07d2a94f8ee661f6eaca7 /app/models/status.rb | |
parent | da4b675aca2c68e976d7920d3fc5b7e2881d1d86 (diff) |
Moving Salmon notifications to background processing, fixing mini-profiler
behaviour with Turbolinks enabled, optimizing Rabl for production
Diffstat (limited to 'app/models/status.rb')
-rw-r--r-- | app/models/status.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index 439cd3053..7ea92df2c 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -17,7 +17,7 @@ class Status < ActiveRecord::Base validates :text, presence: true, if: Proc.new { |s| s.local? && !s.reblog? } scope :with_counters, -> { select('statuses.*, (select count(r.id) from statuses as r where r.reblog_of_id = statuses.id) as reblogs_count, (select count(f.id) from favourites as f where f.status_id = statuses.id) as favourites_count') } - scope :with_includes, -> { includes(:account, :mentions, :stream_entry, reblog: [:account, :mentions], thread: [:account, :mentions]) } + scope :with_includes, -> { includes(:account, :mentions, :stream_entry, reblog: [:account, :mentions], thread: :account) } def local? self.uri.nil? |