0
0
Fork 0

Merge branch 'master' into fix/cache_blocking

This commit is contained in:
Effy Elden 2017-04-17 01:41:33 +10:00 committed by GitHub
commit acd33101c5
48 changed files with 453 additions and 184 deletions

View file

@ -110,6 +110,10 @@ class Status < ApplicationRecord
results
end
def non_sensitive_with_media?
!sensitive? && media_attachments.any?
end
class << self
def as_home_timeline(account)
where(account: [account] + account.following)